diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:14:57 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:14:57 +0000 |
commit | 472e1ad029ba55d9b6a30b1e38c8eee6558230fe (patch) | |
tree | c73e66835805957a014d2c4c9a5985c202b31338 /solenv/inc/tg_zip.mk | |
parent | 9ac7be00e663913bee14ddac072c91ef00b11145 (diff) |
INTEGRATION: CWS vq12 (1.22.100); FILE MERGED
2005/02/20 18:09:45 vq 1.22.100.1: #i29609# Use $(IFEXIST) and $(THEN) macros to use the correct syntax
for W32-4nt or W32-tcsh.
Diffstat (limited to 'solenv/inc/tg_zip.mk')
-rw-r--r-- | solenv/inc/tg_zip.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 54537d2d941e..14b8fa11ca66 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_zip.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: rt $ $Date: 2004-12-16 12:58:28 $ +# last change: $Author: obo $ $Date: 2005-03-18 10:14:57 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -212,13 +212,8 @@ $(ZIP$(TNR)TARGETN) : delzip @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV) @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) @+-$(RM) $@ >& $(NULLDEV) -.IF "$(GUI)"=="UNX" - @+if ( -r $@.$(INPATH) ) $(RENAME) $@.$(INPATH) $@ -# @+if ( -r $@ ) $(TOUCH) $@ -.ELSE # "$(GUI)"=="UNX" - @+if exist $@.$(INPATH) $(RENAME) $@.$(INPATH) $@ -# @+if exist $@ $(TOUCH) $@ -.ENDIF # "$(GUI)"=="UNX" + @+$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME) $@.$(INPATH) $@ +# @+$(IFEXIST) $@ $(THEN) $(TOUCH) $@ .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).{$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}.zip >& $(NULLDEV) |