mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS execshellmacrogone (1.34.8); FILE MERGED

Browse Source 
2007/10/24 06:35:42 rene 1.34.8.1: #i79760# krs patches for supressing "Executing shell macro..." output
This commit is contained in:
Rüdiger Timm
2007-11-06 14:58:43 +00:00
parent 442a7d537b
commit fdd9e88b26
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/makefile.mk
View File

@@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $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 Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # 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" .IF "$(GUI)"=="UNX"
BUILD_DIR= BUILD_DIR=
MYCWD=$(shell pwd)/$(INPATH)/misc/build MYCWD=$(shell @pwd)/$(INPATH)/misc/build
.IF "$(SYSBASE)"!="" .IF "$(SYSBASE)"!=""
python_CFLAGS+=-I$(SYSBASE)$/usr$/include python_CFLAGS+=-I$(SYSBASE)$/usr$/include
@@ -130,7 +130,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; c
# ---------------------------------- # ----------------------------------
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
BUILD_DIR= BUILD_DIR=
MYCWD=$(shell pwd)/$(INPATH)/misc/build MYCWD=$(shell @pwd)/$(INPATH)/misc/build
CC:=$(CC:s/guw.exe //) CC:=$(CC:s/guw.exe //)
CXX:=$(CXX:s/guw.exe //) CXX:=$(CXX:s/guw.exe //)
LDFLAGS:=-mno-cygwin LDFLAGS:=-mno-cygwin