diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:58:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:58:43 +0000 |
| commit | fdd9e88b263ea4cfded99de7115ce0f5aa84fd6c (patch) | |
| tree | 129042ce81372aad2bd0059382375c502030573a /python | |
| parent | 442a7d537b76444983130264a97d2b310de01222 (diff) | |
INTEGRATION: CWS execshellmacrogone (1.34.8); FILE MERGED
2007/10/24 06:35:42 rene 1.34.8.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index a0382362adef..ff7cb090b353 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: hr $ $Date: 2007-06-27 12:12:12 $ +# last change: $Author: rt $ $Date: 2007-11-06 15:58:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -91,7 +91,7 @@ ADDITIONAL_FILES+=Lib/plat-cygwin Python/fileblocks.c .IF "$(GUI)"=="UNX" BUILD_DIR= -MYCWD=$(shell pwd)/$(INPATH)/misc/build +MYCWD=$(shell @pwd)/$(INPATH)/misc/build .IF "$(SYSBASE)"!="" python_CFLAGS+=-I$(SYSBASE)$/usr$/include @@ -130,7 +130,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; c # ---------------------------------- .IF "$(COM)"=="GCC" BUILD_DIR= -MYCWD=$(shell pwd)/$(INPATH)/misc/build +MYCWD=$(shell @pwd)/$(INPATH)/misc/build CC:=$(CC:s/guw.exe //) CXX:=$(CXX:s/guw.exe //) LDFLAGS:=-mno-cygwin |