diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-05 09:42:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-05 09:42:24 +0000 |
| commit | 8c6c3f385604d56d8b6853afac1b0398478489f0 (patch) | |
| tree | 5caf837bb81afe22abc7ee18b8c7ee2a7209eb3d /solenv/inc/tg_zip.mk | |
| parent | 5aa3b1a7116f6dab4f66d86c46cd508d850eb0ee (diff) | |
INTEGRATION: CWS ause068 (1.30.84); FILE MERGED
2006/09/15 13:26:36 hjs 1.30.84.1: #i69536# don't force shell for echo
Diffstat (limited to 'solenv/inc/tg_zip.mk')
| -rw-r--r-- | solenv/inc/tg_zip.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 7b3f0815420e..a4b4b5df2da8 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_zip.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.31 $ # -# last change: $Author: kz $ $Date: 2006-07-19 09:38:41 $ +# last change: $Author: kz $ $Date: 2006-10-05 10:42:24 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -95,33 +95,33 @@ ZIP$(TNR)HELPVAR=$(BIN)$/$(ZIP$(TNR)TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP$(TNR)DEPFILE) : - +echo # > $(MISC)$/$(@:f) + echo # > $(MISC)$/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" - @+echo type 1 + @echo type 1 +-$(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) .ELSE # "$(ZIP$(TNR)DIR)" != "" - @+echo type 2 + @echo type 2 +-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP$(TNR)DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" - @+echo type 3 + @echo type 3 +-$(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) .ELSE # "$(ZIP$(TNR)DIR)" != "" - @+echo type 4 + @echo type 4 +-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) .ENDIF # "$(ZIP$(TNR)DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @+echo $@ : makefile.mk >> $(MISC)$/$(@:f) + @echo $@ : makefile.mk >> $(MISC)$/$(@:f) $(ZIP$(TNR)TARGETN) : delzip - @+echo ------------------------------ - @+echo Making: $@ - @$(!eq,$?,$(?:s/delzip/zzz/) +-$(RM) +echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)) >&$(NULLDEV) - @+echo rebuilding zipfiles $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) ) - @+echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) ) + @echo ------------------------------ + @echo Making: $@ + @$(!eq,$?,$(?:s/delzip/zzz/) +-$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)) >&$(NULLDEV) + @echo rebuilding zipfiles $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) ) + @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) ) .IF "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) >& $(NULLDEV) |