diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:35:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 14:35:10 +0000 |
| commit | b4d38fe96c983e3dde9b61c16a0704294c1be9e9 (patch) | |
| tree | 9bf21076778489082b7f29e7f2dac9c4980dd0ad /python | |
| parent | b28ac9b5bb75073a1e7d3300a239e75a16d0e391 (diff) | |
INTEGRATION: CWS ause069 (1.26.2); FILE MERGED
2006/12/04 22:45:19 hjs 1.26.2.2: RESYNC: (1.26-1.27); FILE MERGED
2006/10/18 17:12:19 hjs 1.26.2.1: #i70359# remove forced shell calls
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index c7a982d58dc7..f0a1b8bfb60c 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.28 $ # -# last change: $Author: kz $ $Date: 2006-11-08 11:58:59 $ +# last change: $Author: obo $ $Date: 2007-01-25 15:35:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -104,9 +104,9 @@ CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CFLAG CONFIGURE_ACTION += --disable-ipv6 .ENDIF .IF "$(COMNAME)"=="sunpro5" -.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -CC:=$(COMPATH)$/bin$/cc -.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" +#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" +#CC:=$(COMPATH)$/bin$/cc +#.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" .ENDIF # "$(COMNAME)"=="sunpro5" .IF "$(OS)" == "IRIX" @@ -169,10 +169,10 @@ $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) #-------------------- # to be moved to tg_ext.mk $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2 - @+-$(RM) $@ + @-$(RM) $@ .IF "$(GUI)"=="UNX" @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -xvf - ") .ELSE # "$(GUI)"=="UNX" @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) .ENDIF # "$(GUI)"=="UNX" - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ + @$(COPY) $(mktmp $(UNPACKCMD)) $@ |