diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 10:27:38 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 10:27:38 +0000 |
| commit | df489818b53e1ee697c34c18e5c4a26dba001370 (patch) | |
| tree | 092ffaeade18a9414cb800a32ef87c62b9fd236c /reportdesign/util | |
| parent | bf5ba8f3b15bb1d9fd0b573205fa4d4f0e9dbf88 (diff) | |
INTEGRATION: CWS rpt23fix04_SRC680 (1.3.8); FILE MERGED
2007/08/14 08:12:13 oj 1.3.8.2: #i80666# add new thirdparty license
2007/08/14 07:09:25 oj 1.3.8.1: #i80666# add license and readme
Diffstat (limited to 'reportdesign/util')
| -rw-r--r-- | reportdesign/util/makefile.mk | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk index 8bfc2f78f..4873bce0b 100644 --- a/reportdesign/util/makefile.mk +++ b/reportdesign/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2007-08-02 14:42:41 $ +# last change: $Author: ihi $ $Date: 2007-08-17 11:27:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -213,15 +213,11 @@ ZIP1EXT=.oxt XMLFILES := $(ZIP1DIR)$/description.xml \ $(ZIP1DIR)$/META-INF$/manifest.xml -.IF "$(GUI)"!="WNT" -TXTFILES:=$(foreach,i,$(WITH_LANG) $(ZIP1DIR)$/registration$/LICENSE_$i) -LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,LICENSE_, $(i:f))" />) -.ELSE # "$(GUI)"!="WNT" -TXTFILES:=$(foreach,i,$(WITH_LANG) $(ZIP1DIR)$/registration$/license_$i.txt) -LICLINES:=$(foreach,i,$(TXTFILES) <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" />) -.ENDIF # "$(GUI)"!="WNT" - -HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html +HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \ + $(ZIP1DIR)$/readme_en-US.html \ + $(ZIP1DIR)$/readme_en-US.txt \ + $(ZIP1DIR)$/license_en-US.html \ + $(ZIP1DIR)$/registration$/license_en-US.txt REPRORTJARFILES := \ $(ZIP1DIR)$/jcommon-1.0.10.jar \ @@ -240,15 +236,14 @@ REPRORTJARFILES := \ # --- Targets ---------------------------------- .INCLUDE : target.mk -.IF "$(ZIP1TARGETN)"!=" -$(ZIP1TARGETN) : $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) +.IF "$(ZIP1TARGETN)"!="" +$(ZIP1TARGETN) : $(XMLFILES) $(HTMLFILES) $(REPRORTJARFILES) .ENDIF # "$(ZIP1TARGETN)"!=" $(ZIP1DIR)$/description.xml : pre.xml post.xml @@-$(MKDIRHIER) $(@:d) @@-$(RM) $(ZIP1DIR)$/description.xml $(TYPE) pre.xml > $@ - $(TYPE) $(mktmp $(LICLINES)) >> $@ $(TYPE) post.xml >> $@ $(ZIP1DIR)$/%.xml : %.xml @@ -267,15 +262,19 @@ $(ZIP1DIR)$/META-INF$/%.xml : %.xml @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/registration$/license_%.txt : $(SOLARBINDIR)$/osl$/license_%.txt - @@-$(MKDIRHIER) $(@:d) +$(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% + @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/registration$/LICENSE_% : $(SOLARBINDIR)$/osl$/LICENSE_% - @@-$(MKDIRHIER) $(@:d) +$(ZIP1DIR)$/registration$/license_en-US.txt : $(PRJ)$/license$/license_en-US.txt + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(ZIP1DIR)$/license_en-US.html : $(PRJ)$/license$/license_en-US.html + @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : THIRDPARTYREADMELICENSE.html +$(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ |