summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-04-13 13:27:41 +0200
committerJens-Heiner Rechtien <hr@openoffice.org>2010-04-13 13:27:41 +0200
commitaf78b0f6469256179ce898cd9cc368de076a6e9e (patch)
tree3a632e6149251ff9b4148b10cd5116ede099b9bd /python
parentf02b107c44ce635afe70bda5fd4c3fd2dc606727 (diff)
parent9edc28815a32b0be4e8f54369baeea17625941da (diff)
CWS-TOOLING: integrate CWS ause117
Diffstat (limited to 'python')
-rw-r--r--python/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/makefile.mk b/python/makefile.mk
index b4643dd42b6c..86d9835e8604 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -79,7 +79,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-in
.IF "$(OS)$(CPU)" == "SOLARISI"
CONFIGURE_ACTION += --disable-ipv6
.ENDIF
-BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; chmod -R ug+w $(MYCWD)/python-inst
+BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include
.ELSE
# ----------------------------------
# WINDOWS
@@ -94,7 +94,7 @@ python_LDFLAGS=-mno-cygwin -mthreads
python_LDFLAGS+=-shared-libgcc
.ENDIF
CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CC="$(CC:s/guw.exe //)" CXX="$(CXX:s/guw.exe //)" MACHDEP=MINGW32 LN="cp -p" CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
-BUILD_ACTION=$(ENV_BUILD) make ; make install
+BUILD_ACTION=$(ENV_BUILD) make && make install
.ELSE
#PYTHONPATH:=..$/Lib
#.EXPORT : PYTHONPATH