User: ihi Date: 2007-08-17 11:27:41+0000 Modified: dba/reportdesign/util/makefile.mk
Log: 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 File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.3&r2=1.4 Delta lines: +16 -17 --------------------- --- makefile.mk 2007-08-02 14:42:41+0000 1.3 +++ makefile.mk 2007-08-17 11:27:38+0000 1.4 @@ -213,15 +213,11 @@ 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 @@ # --- 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 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/registration$/license_%.txt : $(SOLARBINDIR)$/osl$/license_%.txt +$(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + +$(ZIP1DIR)$/registration$/license_en-US.txt : $(PRJ)$/license$/license_en-US.txt @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/registration$/LICENSE_% : $(SOLARBINDIR)$/osl$/LICENSE_% +$(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) $< $@ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
