From 6439592ae69409e6301e0d9374e02d236f25f50e Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 6 Mar 2008 14:13:59 +0000 Subject: INTEGRATION: CWS ause084_DEV300 (1.34.46); FILE MERGED 2007/12/20 15:12:58 hjs 1.34.46.3: #i77202# COMMONBIN won't work when changing common_build_zip in local makefile 2007/12/17 16:37:46 hjs 1.34.46.2: #i77202# minor cleanup using variables supplied by settings.mk 2007/12/17 16:31:06 hjs 1.34.46.1: #i77202# removed specialcasing of PRJ=.; less copying around of archives --- solenv/inc/_tg_zip.mk | 170 ++++++++++++++++++-------------------------------- 1 file changed, 60 insertions(+), 110 deletions(-) (limited to 'solenv/inc/_tg_zip.mk') diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk index d715ddb99107..f3b62b220c71 100644 --- a/solenv/inc/_tg_zip.mk +++ b/solenv/inc/_tg_zip.mk @@ -53,17 +53,9 @@ ZIP1TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP1HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP1TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP1HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP1TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP1HELPVAR=$(COMMONBIN)$/$(ZIP1TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP1HELPVAR=$(BIN)$/$(ZIP1TARGET) -.ELSE # "$(PRJ)"=="." -ZIP1HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP1TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP1DEPFILE) : @@ -100,19 +92,22 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS) .IF "$(ZIP1DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away$/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@.$(INPATH) $(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) .ELSE # "$(ZIP1DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP1DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP1DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP1DIR)" != "" + echo mmm{$(subst,$(ZIP1HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP1HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away$/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@ @@ -178,17 +173,9 @@ ZIP2TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : $(ZIP2TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP2HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP2TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP2HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP2TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP2HELPVAR=$(COMMONBIN)$/$(ZIP2TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP2HELPVAR=$(BIN)$/$(ZIP2TARGET) -.ELSE # "$(PRJ)"=="." -ZIP2HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP2TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP2DEPFILE) : @@ -225,19 +212,22 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS) .IF "$(ZIP2DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away$/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@.$(INPATH) $(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) .ELSE # "$(ZIP2DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP2DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP2DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP2DIR)" != "" + echo mmm{$(subst,$(ZIP2HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP2HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away$/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@ @@ -303,17 +293,9 @@ ZIP3TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : $(ZIP3TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP3HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP3TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP3HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP3TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP3HELPVAR=$(COMMONBIN)$/$(ZIP3TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP3HELPVAR=$(BIN)$/$(ZIP3TARGET) -.ELSE # "$(PRJ)"=="." -ZIP3HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP3TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP3DEPFILE) : @@ -350,19 +332,22 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS) .IF "$(ZIP3DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away$/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@.$(INPATH) $(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) .ELSE # "$(ZIP3DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP3DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP3DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP3DIR)" != "" + echo mmm{$(subst,$(ZIP3HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP3HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away$/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@ @@ -428,17 +413,9 @@ ZIP4TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : $(ZIP4TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP4HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP4TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP4HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP4TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP4HELPVAR=$(COMMONBIN)$/$(ZIP4TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP4HELPVAR=$(BIN)$/$(ZIP4TARGET) -.ELSE # "$(PRJ)"=="." -ZIP4HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP4TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP4DEPFILE) : @@ -475,19 +452,22 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS) .IF "$(ZIP4DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away$/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@.$(INPATH) $(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) .ELSE # "$(ZIP4DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP4DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP4DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP4DIR)" != "" + echo mmm{$(subst,$(ZIP4HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP4HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away$/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@ @@ -553,17 +533,9 @@ ZIP5TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP5TARGET).dpzz : $(ZIP5TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP5HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP5TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP5HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP5TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP5HELPVAR=$(COMMONBIN)$/$(ZIP5TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP5HELPVAR=$(BIN)$/$(ZIP5TARGET) -.ELSE # "$(PRJ)"=="." -ZIP5HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP5TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP5DEPFILE) : @@ -600,19 +572,22 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS) .IF "$(ZIP5DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away$/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@.$(INPATH) $(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) .ELSE # "$(ZIP5DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP5DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP5DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP5DIR)" != "" + echo mmm{$(subst,$(ZIP5HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP5HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away$/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@ @@ -678,17 +653,9 @@ ZIP6TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP6TARGET).dpzz : $(ZIP6TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP6HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP6TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP6HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP6TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP6HELPVAR=$(COMMONBIN)$/$(ZIP6TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP6HELPVAR=$(BIN)$/$(ZIP6TARGET) -.ELSE # "$(PRJ)"=="." -ZIP6HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP6TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP6DEPFILE) : @@ -725,19 +692,22 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS) .IF "$(ZIP6DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away$/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@.$(INPATH) $(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) .ELSE # "$(ZIP6DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP6DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP6DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP6DIR)" != "" + echo mmm{$(subst,$(ZIP6HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP6HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away$/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@ @@ -803,17 +773,9 @@ ZIP7TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP7TARGET).dpzz : $(ZIP7TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP7HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP7TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP7HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP7TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP7HELPVAR=$(COMMONBIN)$/$(ZIP7TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP7HELPVAR=$(BIN)$/$(ZIP7TARGET) -.ELSE # "$(PRJ)"=="." -ZIP7HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP7TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP7DEPFILE) : @@ -850,19 +812,22 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS) .IF "$(ZIP7DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away$/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@.$(INPATH) $(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) .ELSE # "$(ZIP7DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP7DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP7DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP7DIR)" != "" + echo mmm{$(subst,$(ZIP7HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP7HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away$/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@ @@ -928,17 +893,9 @@ ZIP8TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP8TARGET).dpzz : $(ZIP8TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP8HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP8TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP8HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP8TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP8HELPVAR=$(COMMONBIN)$/$(ZIP8TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP8HELPVAR=$(BIN)$/$(ZIP8TARGET) -.ELSE # "$(PRJ)"=="." -ZIP8HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP8TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP8DEPFILE) : @@ -975,19 +932,22 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS) .IF "$(ZIP8DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away$/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@.$(INPATH) $(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) .ELSE # "$(ZIP8DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP8DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP8DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP8DIR)" != "" + echo mmm{$(subst,$(ZIP8HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP8HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away$/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@ @@ -1053,17 +1013,9 @@ ZIP9TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP9TARGET).dpzz : $(ZIP9TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP9HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP9TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP9HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP9TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP9HELPVAR=$(COMMONBIN)$/$(ZIP9TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP9HELPVAR=$(BIN)$/$(ZIP9TARGET) -.ELSE # "$(PRJ)"=="." -ZIP9HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP9TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP9DEPFILE) : @@ -1100,19 +1052,22 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS) .IF "$(ZIP9DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away$/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@.$(INPATH) $(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) .ELSE # "$(ZIP9DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP9DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP9DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP9DIR)" != "" + echo mmm{$(subst,$(ZIP9HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP9HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away$/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@ @@ -1178,17 +1133,9 @@ ZIP10TMP:=$(mktmp iii) $(MISC)$/$(TARGET).$(PWD:f).$(ZIP10TARGET).dpzz : $(ZIP10TARGETN) .IF "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." -ZIP10HELPVAR={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP10TARGET)} -.ELSE # "$(PRJ)"=="." -ZIP10HELPVAR=$(subst,.$/,$(NULL) {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(ZIP10TARGET)}) -.ENDIF # "$(PRJ)"=="." +ZIP10HELPVAR=$(COMMONBIN)$/$(ZIP10TARGET) .ELSE # "$(common_build_zip)"!="" -.IF "$(PRJ)"!="." ZIP10HELPVAR=$(BIN)$/$(ZIP10TARGET) -.ELSE # "$(PRJ)"=="." -ZIP10HELPVAR=$(subst,.$/,$(NULL) $(BIN)$/$(ZIP10TARGET)) -.ENDIF # "$(PRJ)"=="." .ENDIF # "$(common_build_zip)"!="" $(ZIP10DEPFILE) : @@ -1225,19 +1172,22 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS) .IF "$(ZIP10DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away$/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) - $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) + $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@.$(INPATH) $(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) .ELSE # "$(ZIP10DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.ENDIF # "$(ZIP10DIR)" != "" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) +.ENDIF # "$(ZIP10DIR)" != "" @@-$(RM) $@ @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI) # @$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI) # even if it's not used... .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP10DIR)" != "" + echo mmm{$(subst,$(ZIP10HELPVAR),_ $(@:db))}mmm + echo mmm$(ZIP10HELPVAR)mmm + -$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away$/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@ -- cgit v1.2.3