[Libreoffice-commits] .: filter/source

[Caolán McNamara]

 filter/source/svg/makefile.mk |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 3adaf5cf46120cebc0574bd115af4eea220fa0f1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 6 11:33:10 2011 +0100

    Do this on windows only, everything else has some python available

diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
index 8b4221d..d713202 100644
--- a/filter/source/svg/makefile.mk
+++ b/filter/source/svg/makefile.mk
@@ -95,15 +95,9 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
 
-.IF "$(SYSTEM_PYTHON)"!="YES"
+.IF "$(GUI)"=="WNT" && "$(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