diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-10-05 09:40:20 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-10-05 09:40:20 +0000 |
commit | d075611bcc06eb0c94d9c7026d9c298de4ed418d (patch) | |
tree | 1bc5cc3a20afd826905b817cd1e483269a0e9d6b /solenv/inc/tg_jar.mk | |
parent | 1fc82dedb422b1eec34e33e80858747b0f0014b6 (diff) |
INTEGRATION: CWS ause068 (1.19.142); FILE MERGED
2006/09/15 13:26:35 hjs 1.19.142.1: #i69536# don't force shell for echo
Diffstat (limited to 'solenv/inc/tg_jar.mk')
-rw-r--r-- | solenv/inc/tg_jar.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index 00f1587f551a..30ac8da8f3a7 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_jar.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: vg $ $Date: 2006-05-18 10:02:49 $ +# last change: $Author: kz $ $Date: 2006-10-05 10:40:20 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -60,12 +60,12 @@ $(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$( $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) +-$(MKDIRHIER) $(@:d) >& $(NULLDEV) +-$(RM) $@ >& $(NULLDEV) - +echo Manifest-Version: 1.0 > $@ + echo Manifest-Version: 1.0 > $@ .IF "$(JARCLASSPATH)" != "" - +echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@ + echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@ .ENDIF # $(RSCREVISION) contains chars that must be quoted (for *NIX shells) - +echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@ + echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@ .IF "$(CUSTOMMANIFESTFILE)"!="" +$(TYPE) $(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@ .ENDIF # "$(CUSTOMMANIFESTFILE)"!="" |