diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:14:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:14:13 +0000 |
| commit | 572c3f1d296534862892c7995608899da89b88dc (patch) | |
| tree | 4f335294039913cf2d36851afc4511f1cb69bc3e /solenv/inc/tg_jar.mk | |
| parent | 94f5157035d2e12501a1ec17220468f9b890701d (diff) | |
INTEGRATION: CWS vq12 (1.13.146); FILE MERGED
2005/02/27 02:12:52 vq 1.13.146.1: #i29675# Remove some $(USE_SHELL) checks using $(USQ) and $(EMQ).
Diffstat (limited to 'solenv/inc/tg_jar.mk')
| -rw-r--r-- | solenv/inc/tg_jar.mk | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index 8747422e4cf5..ed660b3a2614 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_jar.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: hr $ $Date: 2004-11-09 12:12:03 $ +# last change: $Author: obo $ $Date: 2005-03-18 10:14:13 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -94,11 +94,8 @@ $(MISC)$/$(JARTARGET:b) : $(SOLARINCDIR)$/$(UPD)minor.mk @+echo Specification-Version: $(VERSION) >> $@ @+echo Specification-Vendor: $(VENDOR) >> $@ @+echo Implementation-Title: $(IMPLTITLE) >> $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - @+echo "Implementation-Version: $(RSCREVISION)" >> $@ -.ELSE # "$(GUI)"=="UNX"" || "$(USE_SHELL)"!="4nt" - @+echo Implementation-Version: $(RSCREVISION) >> $@ -.ENDIF # "$(GUI)"=="UNX"" || "$(USE_SHELL)"!="4nt" +# $(RSCREVISION) contains chars that must be quoted (for *NIX shells) + @+echo $(USQ)Implementation-Version: $(RSCREVISION)$(USQ) >> $@ @+echo Implementation-Vendor: $(VENDOR) >> $@ .ENDIF # "$(USE_EXTENDED_MANIFESTFILE)"!="" @@ -115,11 +112,8 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) $(EXTENDEDMANIFESTFILEDEP) +-$(MKDIR) $(@:d) >& $(NULLDEV) +-$(RM) $@ >& $(NULLDEV) +echo Manifest-Version: 1.0 > $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - +echo "Solar-Version: $(RSCREVISION)" >> $@ -.ELSE # "$(GUI)"=="UNX"" || "$(USE_SHELL)"!="4nt" - +echo Solar-Version: $(RSCREVISION) >> $@ -.ENDIF # "$(GUI)"=="UNX"" || "$(USE_SHELL)"!="4nt" +# $(RSCREVISION) contains chars that must be quoted (for *NIX shells) + +echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@ .IF "$(EXTENDEDMANIFESTFILE)"!="" +$(TYPE) $(MISC)$/$(TARGET)_$(EXTENDEDMANIFESTFILE:f) >> $@ .ENDIF # "$(EXTENDEDMANIFESTFILE)"!="" |