diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-11-18 14:09:30 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-11-18 14:09:30 +0100 |
| commit | ae0ed5947d340d6d68ab84c10bdf09b79030b4e0 (patch) | |
| tree | 1ff408dc9e3956eae201d07b832b7d06e2b33c73 | |
| parent | cd8f98038f47a39c9b72e4910137a6c70d032a37 (diff) | |
Revert "Don't produce .html variant of README_lang files"
Same as with the LICENSE.html. Somewhere the installer still expects
it to be present and complains. Oh well. Someone should do a proper
job in removing superfluous files.
This reverts commit ecf2ec2e37a38c9e82338c81a8a7e49efd5283f4.
| -rwxr-xr-x | readlicense_oo/util/makefile.pmk | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk index 2e072f1b7430..0efd9712f11d 100755 --- a/readlicense_oo/util/makefile.pmk +++ b/readlicense_oo/util/makefile.pmk @@ -30,8 +30,10 @@ .IF "$(GUI)"=="UNX" # uppercase and no filename extension for txt SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/README_$i) +SYSHTMLDOCS=$(SYSTEXTDOCS:+".html") .ELSE # "$(GUI)"=="UNX" SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/readme_$i.txt) +SYSHTMLDOCS=$(SYSTEXTDOCS:s/.txt/.html/) .ENDIF # "$(GUI)"=="UNX" .IF "$(WITH_LANG)"!="" @@ -42,7 +44,7 @@ MERGEDXRM=.$/readme.xrm .INCLUDE : target.mk -ALLTAR : $(SYSTEXTDOCS) +ALLTAR : $(SYSTEXTDOCS) $(SYSHTMLDOCS) $(COMMONMISC)$/readme.dtd : ..$/readme.dtd $(MKDIRHIER) $(MISC)$/$(GUI) @@ -53,6 +55,24 @@ virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl $(MISC)$/readme_text.xsl : virtual $(SED) '' < ..$/readme.xsl > $@ +$(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual' + @@-$(MKDIRHIER) $(@:d) + $(XSLTPROC) --nonet --novalid -o $@ \ + --stringparam os1 $(OS) --stringparam gui1 $(GUI) --stringparam com1 $(COM) \ + --stringparam cp1 $(CPUNAME) --stringparam type html --stringparam lang1 $* \ + ..$/readme.xsl $(MERGEDXRM) +.IF "$(GUI)"=="UNX" + chmod g+w $(MISC)$/$(GUI) +.ENDIF # "$(GUI)"=="UNX" + +$(MISC)$/$(GUI)$/$(eq,$(GUI),OS2 readme README)_%.html : 'virtual' + @@-$(MKDIRHIER) $(@:d) + $(XSLTPROC) --nonet --novalid -o $@ \ + --stringparam os1 $(OS) --stringparam gui1 $(GUI) --stringparam com1 $(COM) \ + --stringparam cp1 $(CPUNAME) --stringparam type html --stringparam lang1 $* \ + ..$/readme.xsl $(MERGEDXRM) + +# no percent-rule to avoid ambiguous inference chains for README_<lang>.html $(SYSTEXTDOCS) : $(MISC)$/readme_text.xsl @@-$(MKDIRHIER) $(@:d) $(XSLTPROC) --nonet --novalid -o $@ \ |