[Libreoffice-commits] .: filter/source

[David Tardon]

 filter/source/svg/makefile.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 82f6c0502e51afbc25e5bf0fcee7914a1a5b3f28
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Sep 9 06:23:17 2011 +0200

    do not hardcode python binary name

diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
index 98c7232..0c8a89c 100644
--- a/filter/source/svg/makefile.mk
+++ b/filter/source/svg/makefile.mk
@@ -96,11 +96,11 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
 .IF "$(OS_FOR_BUILD)"=="WNT" && "$(SYSTEM_PYTHON)"!="YES"
-PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
+PYTHONCMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
 PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
 .EXPORT: PYTHONPATH
 .ELSE                   # "$(SYSTEM_PYTHON)"!="YES"
-PYTHON=$(WRAPCMD) python
+PYTHONCMD=$(WRAPCMD) $(PYTHON)
 .ENDIF                  # "$(SYSTEM_PYTHON)"!="YES"
 
 # --- Targets ----------------------------------
@@ -117,7 +117,7 @@ $(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk
 ALLTAR : $(MISC)/svgfilter.component
 
 $(INCCOM)$/svgscript.hxx : presentation_engine.js js2hxx.py
-         $(PYTHON) js2hxx.py presentation_engine.js $@
+         $(PYTHONCMD) js2hxx.py presentation_engine.js $@
 $(SLO)$/svgexport.obj : svgexport.cxx $(INCCOM)$/svgscript.hxx
 
 $(MISC)/svgfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \