Author: diego Date: Wed Jun 23 14:07:29 2010 New Revision: 31534 Log: Get rid of xmllint wrapper redirection; run commands directly from make. Modified: trunk/DOCS/xml/Makefile trunk/DOCS/xml/configure Changes in other areas also in this revision: Modified: trunk/DOCS/xml/ (props changed) Modified: trunk/DOCS/xml/Makefile ============================================================================== --- trunk/DOCS/xml/Makefile Wed Jun 23 13:37:26 2010 (r31533) +++ trunk/DOCS/xml/Makefile Wed Jun 23 14:07:29 2010 (r31534) @@ -1,12 +1,13 @@ # Makefile for generating the HTML documentation include ../../config.mak +include xml.mak # Generated HTML files go here. HTML = ../HTML MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) -CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh +CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak xsltproc.sh all: html-chunked html-single @@ -48,8 +49,8 @@ $(HTML)/$(lang)/index.html: $(HTML)/$(lang)/MPlayer.html: ./xsltproc.sh $$@ html-single.xsl $$< -xmllint-$(lang): $(lang)/main.xml - ./xmllint.sh $$< +xmllint-$(lang): + SGML_CATALOG_FILES=$(CATALOG) $(XMLLINT_COMMAND) $(lang)/main.xml endef $(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def))) Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Wed Jun 23 13:37:26 2010 (r31533) +++ trunk/DOCS/xml/configure Wed Jun 23 14:07:29 2010 (r31534) @@ -4,7 +4,6 @@ # the other stuff necessary to convert the XML documentation. _xsltwrapper="xsltproc.sh" -_xmllintwrapper="xmllint.sh" echo "Searching for XML catalogs..." for _try_catalog in \ @@ -358,14 +357,7 @@ then _xmllint_command=true fi -cat > $_xmllintwrapper << EOF -#!/bin/sh -# ************************************************** -# This file is generated automatically. DO NOT EDIT. -# ************************************************** -# This is a small wrapper for XML lintian programs. -$_sgmlcatalog -$_xmllint_command +cat > xml.mak << EOF +CATALOG = $_catalog +XMLLINT_COMMAND = $_xmllint_command EOF - -chmod +x $_xmllintwrapper