[Libreoffice-commits] .: readlicense_oo/util

Sebastian Spaeth spaetz at kemper.freedesktop.org
Tue Nov 23 04:14:53 PST 2010


 readlicense_oo/util/makefile.pmk |   22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

New commits:
commit 95d93c5b9fad9748bbdef7ed0076468f8407f04a
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Wed Nov 17 16:39:31 2010 +0100

    Don't produce .html variant of README_lang files
    
    Just provide language specific README files as plain text files.
    
    Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 0efd971..2e072f1 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -30,10 +30,8 @@
 .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)"!=""
@@ -44,7 +42,7 @@ MERGEDXRM=.$/readme.xrm
 
 .INCLUDE : target.mk
 
-ALLTAR : $(SYSTEXTDOCS) $(SYSHTMLDOCS)
+ALLTAR : $(SYSTEXTDOCS)
 
 $(COMMONMISC)$/readme.dtd : ..$/readme.dtd  
     $(MKDIRHIER) $(MISC)$/$(GUI)
@@ -55,24 +53,6 @@ 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 $@ \


More information about the Libreoffice-commits mailing list