[Libreoffice-commits] .: filter/prj filter/source

[Caolán McNamara]

 filter/prj/build.lst          |    2 +-
 filter/source/svg/makefile.mk |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit ab33fc3c5c217779f93d4fa40d9c1936e2309ba3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 6 09:47:39 2011 +0100

    get this building under windows

diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 95cfeb9..9d2601d 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,4 +1,4 @@
-fl      filter  :    TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package NULL
+fl      filter  :    TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL
 fl	filter									usr1	-	all	fl_mkout			NULL
 fl	filter\prj								get		-	all	fl_prj				NULL
 fl	filter\inc								nmake	-	all	fl_inc				NULL
diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
index b76db4d..ccec051 100644
--- a/filter/source/svg/makefile.mk
+++ b/filter/source/svg/makefile.mk
@@ -95,6 +95,21 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
 
+.IF "$(SYSTEM_PYTHON)"!="YES"
+PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
+.IF "$(GUI)"=="WNT"
+PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
+.ELSE                   # "$(GUI)"=="WNT"
+PYTHONPATH:=$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
+PYTHONHOME:=$(SOLARLIBDIR)$/python
+.EXPORT: PYTHONHOME
+.ENDIF                  # "$(GUI)"=="WNT"
+.EXPORT: PYTHONPATH
+.ELSE                   # "$(SYSTEM_PYTHON)"!="YES"
+PYTHON=$(WRAPCMD) python
+ARSE
+.ENDIF                  # "$(SYSTEM_PYTHON)"!="YES"
+
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
@@ -109,7 +124,7 @@ $(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk
 ALLTAR : $(MISC)/svgfilter.component
 
 $(INCCOM)$/svgscript.hxx : presentation_engine.js js2hxx.py
-         js2hxx.py presentation_engine.js $@
+         $(PYTHON) js2hxx.py presentation_engine.js $@
 $(SLO)$/svgexport.obj : svgexport.cxx $(INCCOM)$/svgscript.hxx
 
 $(MISC)/svgfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \