summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-03-05 15:38:30 +0000
committerKurt Zenker <kz@openoffice.org>2008-03-05 15:38:30 +0000
commit8c056940656e71bda218f4ac6bee602854e0304f (patch)
tree2fc24a095957302a8a0eda57cfff66d17e9cfc0e
parenta918cd478568f04d099ccf81775e439584ed1683 (diff)
INTEGRATION: CWS nowrapcmd2 (1.82.34); FILE MERGED
2008/03/01 00:48:51 vq 1.82.34.1: #i85207# Remove WRAPCMDs.
-rw-r--r--instsetoo_native/util/makefile.mk12
1 files changed, 2 insertions, 10 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index e920ddfb6420..7196b7155a3a 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.82 $
+# $Revision: 1.83 $
#
-# last change: $Author: kz $ $Date: 2007-12-12 15:38:02 $
+# last change: $Author: kz $ $Date: 2008-03-05 16:38:30 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -43,15 +43,7 @@ GEN_HID2=TRUE
# PERL:=@echo
-.IF "$(GUI)"=="WNT"
-.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)
-.ENDIF # "$(USE_SHELL)"=="4nt"
-.ELSE # "$(GUI)"=="WNT"
-PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
-.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
.IF "$(CWS_WORK_STAMP)=="" || "$(UPDATER)!=""