strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS execshellmacrogone (1.76.6); FILE MERGED

Browse source 
2007/10/24 08:34:15 rene 1.76.6.2: RESYNC: (1.76-1.77); FILE MERGED
2007/10/24 06:35:47 rene 1.76.6.1: #i79760# krs patches for supressing "Executing shell macro..." output
This commit is contained in:
Rüdiger Timm 2007-11-06 14:46:17 +00:00
parent 0e42af5024
commit 7e46297770
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
solenv/inc/tg_ext.mk
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: tg_ext.mk,v $ # $RCSfile: tg_ext.mk,v $
# #
# $Revision: 1.78 $ # $Revision: 1.79 $
# #
# last change: $Author: hr $ $Date: 2007-11-01 17:11:27 $ # last change: $Author: rt $ $Date: 2007-11-06 15:46:17 $
# #
# 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.
@ -38,9 +38,9 @@
# setup INCLUDE variable for use by VC++ # setup INCLUDE variable for use by VC++
.IF "$(GUI)$(COM)"=="WNTMSC" .IF "$(GUI)$(COM)"=="WNTMSC"
.IF "$(EXT_USE_STLPORT)"=="" .IF "$(EXT_USE_STLPORT)"==""
INCLUDE!:=$(shell $(4nt_force_shell)$(WRAPCMD) echo $(subst,$/stl, $(SOLARINC))) INCLUDE!:=$(shell @$(4nt_force_shell)$(WRAPCMD) echo $(subst,$/stl, $(SOLARINC)))
.ELSE .ELSE
INCLUDE!:=$(shell $(4nt_force_shell)$(WRAPCMD) echo $(SOLARINC)) INCLUDE!:=$(shell @$(4nt_force_shell)$(WRAPCMD) echo $(SOLARINC))
.ENDIF # "$(EXT_USE_STLPORT)"=="" .ENDIF # "$(EXT_USE_STLPORT)"==""
INCLUDE!:=$(INCLUDE:s/ -I/;/) INCLUDE!:=$(INCLUDE:s/ -I/;/)
.EXPORT : INCLUDE .EXPORT : INCLUDE
@ -167,7 +167,7 @@ $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpa
-rm -rf $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme -rm -rf $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme
@-$(MKDIR) $(PACKAGE_DIR:d) @-$(MKDIR) $(PACKAGE_DIR:d)
@-$(MKDIR) $(PACKAGE_DIR) @-$(MKDIR) $(PACKAGE_DIR)
cd $(PACKAGE_DIR) && ( $(shell $(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) cd $(PACKAGE_DIR) && ( $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
@echo make writeable... @echo make writeable...
.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE) @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
@ -277,7 +277,7 @@ $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
.IF "$(OUTDIR2INC)"!="" .IF "$(OUTDIR2INC)"!=""
.IF "$(USE_SHELL)"=="4nt" .IF "$(USE_SHELL)"=="4nt"
@-$(MKDIR) $(foreach,i,$(OUTDIR2INC) $(INCCOM)$/$(i:b)) @-$(MKDIR) $(foreach,i,$(OUTDIR2INC) $(INCCOM)$/$(i:b))
@echo copied $(foreach,i,$(OUTDIR2INC) $(shell $(COPY) $(COPYRECURSE) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i$/* $(INCCOM)$/$(i:b) >& $(NULLDEV) && echo $i)) @echo copied $(foreach,i,$(OUTDIR2INC) $(shell @$(COPY) $(COPYRECURSE) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i$/* $(INCCOM)$/$(i:b) >& $(NULLDEV) && echo $i))
.ELSE # "$(USE_SHELL)"=="4nt" .ELSE # "$(USE_SHELL)"=="4nt"
$(COPY) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM) $(COPY) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM)
.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(USE_SHELL)"=="4nt"
@ -293,7 +293,7 @@ $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
$(MISC)$/$(TARFILE_ROOTDIR) : $(MISC)$/$(TARFILE_NAME).unpack $(MISC)$/$(TARFILE_ROOTDIR) : $(MISC)$/$(TARFILE_NAME).unpack
@-mv $(MISC)$/$(TARFILE_ROOTDIR) $(MISC)$/$(TARFILE_ROOTDIR).old @-mv $(MISC)$/$(TARFILE_ROOTDIR) $(MISC)$/$(TARFILE_ROOTDIR).old
@-rm -rf $(MISC)$/$(TARFILE_ROOTDIR).old @-rm -rf $(MISC)$/$(TARFILE_ROOTDIR).old
cd $(MISC) && $(subst,$(BACK_PATH),..$/..$/ $(shell $(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) cd $(MISC) && $(subst,$(BACK_PATH),..$/..$/ $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack))
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
$(TOUCH) $@ $(TOUCH) $@
.ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(GUI)"=="UNX"