diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:38:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:38:02 +0000 |
| commit | 944be6ddc7ce79c81729e8da6c1f3e0ef72eed9d (patch) | |
| tree | 22058b0e807e19ad22e36b6f338a14aecc1917f5 /instsetoo_native | |
| parent | 76224f1c8ffbac7d1cf510e2203edd9f57b98318 (diff) | |
INTEGRATION: CWS nowrapcmd1 (1.72.16); FILE MERGED
2007/11/30 20:23:06 vq 1.72.16.3: RESYNC: (1.75-1.80); FILE MERGED
2007/11/08 20:49:36 vq 1.72.16.2: RESYNC: (1.72-1.75); FILE MERGED
2007/10/14 05:11:25 vq 1.72.16.1: #i82202# Use ; as path seperator for W32 if WRAPCMD is not set.
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index ab9f9c425c3c..e920ddfb6420 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.81 $ +# $Revision: 1.82 $ # -# last change: $Author: vg $ $Date: 2007-12-07 13:05:34 $ +# last change: $Author: kz $ $Date: 2007-12-12 15:38:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,7 +44,7 @@ GEN_HID2=TRUE # PERL:=@echo .IF "$(GUI)"=="WNT" -.IF "$(USE_SHELL)"=="4nt" +.IF "$(USE_SHELL)"=="4nt" || "$(WRAPCMD)"=="" PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload .ELSE # "$(USE_SHELL)"=="4nt" PYTHONPATH:=$(shell @$(WRAPCMD) echo $(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload) |