diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 17:51:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 17:51:39 +0000 |
| commit | 23096e681991d2a107f9de2c57eababe9c66f7b2 (patch) | |
| tree | 6615e1d9bae5d3238121bcabf78cfd593f562002 | |
| parent | 9cd71c4db50aabf4b42d553663d9a3693a1b99bf (diff) | |
#i80368# additional patch for cloph12
| -rwxr-xr-x | readlicense_oo/makefile.mk | 6 | ||||
| -rwxr-xr-x | readlicense_oo/util/makefile.pmk | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk index da48f89bae..bb6eff9cbd 100755 --- a/readlicense_oo/makefile.mk +++ b/readlicense_oo/makefile.mk @@ -35,14 +35,14 @@ just_for_nice_optics: $(fallbacklicenses) # for windows, convert linends to DOS $(SYSLICDEST)$/license_en-US.% : source$/license$/license_en-US.% - @$(MKDIRHIER) $(SYSLICDEST) + @-$(MKDIRHIER) $(SYSLICDEST) $(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@ # for others just copy $(SYSLICDEST)$/LICENSE_en-US : source$/license$/license_en-US.txt - @$(MKDIRHIER) $(SYSLICDEST) + @-$(MKDIRHIER) $(SYSLICDEST) $(COPY) $< $@ $(SYSLICDEST)$/LICENSE_en-US.html : source$/license$/license_en-US.html - @$(MKDIRHIER) $(SYSLICDEST) + @-$(MKDIRHIER) $(SYSLICDEST) $(COPY) $< $@ diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk index 37f70734f5..1a5310143b 100755 --- a/readlicense_oo/util/makefile.pmk +++ b/readlicense_oo/util/makefile.pmk @@ -55,7 +55,11 @@ $(COMMONMISC)$/readme.dtd : ..$/readme.dtd virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl $(MISC)$/readme_text.xsl : virtual +.IF "$(USE_SHELL)"!="4nt" $(SED) 's#method="html".*>#method="text"/>#' < ..$/readme.xsl > $@ +.ELSE # "$(USE_SHELL)"!="4nt" + $(SED) "s/method=\"html\".*>/method=\"text\"\/>/" < ..$/readme.xsl > $@ +.ENDIF # "$(USE_SHELL)"!="4nt" $(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual' $(XSLTPROC) --nonet -o $@ \ |