diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 12:44:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 12:44:18 +0000 |
| commit | 01b9a3a8937ee2f40cbf87135d014c6585a62d1a (patch) | |
| tree | c42ae03fa0aa827f7c6a5773dc31dbe64cd8c32d /solenv/inc/tg_zip.mk | |
| parent | 0698cfa23edc01a0278f297b38bd26fb97f63e81 (diff) | |
INTEGRATION: CWS ooo11rc (1.15.38); FILE MERGED
2003/06/27 10:44:12 hjs 1.15.38.1: #i15915# fix multiprocess problems - make tempfiles unique
Diffstat (limited to 'solenv/inc/tg_zip.mk')
| -rw-r--r-- | solenv/inc/tg_zip.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 0cb8e01aad1d..8a3f082673e0 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_zip.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: hr $ $Date: 2003-03-27 11:48:14 $ +# last change: $Author: vg $ $Date: 2003-07-02 13:44:18 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -136,10 +136,10 @@ $(ZIP$(TNR)TARGETN) : @+echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) ) .IF "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" - @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).zip >& $(NULLDEV) - +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) - +$(COPY) $(ZIP$(TNR)TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) - +$(RM) $(ZIP$(TNR)TMP).zip + @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip >& $(NULLDEV) + +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) + +$(COPY) $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + +$(RM) $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip .ELSE # "$(ZIP$(TNR)DIR)" != "" @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV) +-zip $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir) @@ -156,10 +156,10 @@ $(ZIP$(TNR)TARGETN) : .ENDIF # "$(GUI)"=="UNX" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" - @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).zip >& $(NULLDEV) - +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) - +$(COPY) $(ZIP$(TNR)TMP).zip $@ - +$(RM) $(ZIP$(TNR)TMP).zip + @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip >& $(NULLDEV) + +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) + +$(COPY) $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip $@ + +$(RM) $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip .ELSE # "$(ZIP$(TNR)DIR)" != "" +-zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir) .ENDIF # "$(ZIP$(TNR)DIR)" != "" |