diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-10-08 10:32:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-10-08 10:32:42 +0000 |
| commit | 18a0e449e64e90fb044257c9e0b29d101299bcf7 (patch) | |
| tree | 3bc318ec86e4696875791a0b657b56dd36c57c48 /testtools | |
| parent | 54b3e9e4c3cf2da4158fcb03efe7de2a6d06171c (diff) | |
#i105678# protect against PYTHONPATH going away
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index e0ebad0c1eb3..00d01a117eb4 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -52,10 +52,15 @@ DOLLAR_SIGN=$$ .IF "$(SYSTEM_PYTHON)"!="YES" PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python -.ELSE # "$(SYSTEM_LIBXSLT)"!="YES" +.ELSE # "$(SYSTEM_PYTHON)"!="YES" PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python -.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES" - +.ENDIF # "$(SYSTEM_PYTHON)"!="YES" +.IF "$(GUI)"=="WNT" +PYTHONPATH:=$(SOLARLIBDIR)$/pyuno;$(PWD);$(SOLARLIBDIR) +.ELSE # "$(GUI)"=="WNT" +PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR) +.ENDIF # "$(GUI)"=="WNT" +.EXPORT: PYTHONPATH .IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2" .IF "$(USE_SHELL)"=="bash" |