[MPlayer-DOCS] r31537 - in trunk/DOCS/xml: Makefile configure

23 Jun 2010

Author: diego
Date: Wed Jun 23 15:24:53 2010
New Revision: 31537

Log:
Move xsltproc target file hack to the Makefile.

Modified:
   trunk/DOCS/xml/Makefile
   trunk/DOCS/xml/configure

Modified: trunk/DOCS/xml/Makefile
==============================================================================

--- trunk/DOCS/xml/Makefile	Wed Jun 23 14:38:40 2010	(r31536)
+++ trunk/DOCS/xml/Makefile	Wed Jun 23 15:24:53 2010	(r31537)
@@ -35,16 +35,16 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL):
 	./configure
 
 define lang-def
-html-chunked-$(lang): $(HTML)/$(lang)/index.html
+html-chunked-$(lang): $(HTML)/$(lang)/dummy.html
 html-single-$(lang):  $(HTML)/$(lang)/MPlayer.html
-$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css
+$(HTML)/$(lang)/dummy.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css
 
 $(HTML)/$(lang)/default.css:
 	mkdir -p $$(@D)
 	cp -f default.css $$(@D)
 
-$(HTML)/$(lang)/index.html:
-	./xsltproc.sh $$(@D)/ html-chunk.xsl $$<
+$(HTML)/$(lang)/dummy.html:
+	./xsltproc.sh $$@ html-chunk.xsl $$<
 
 $(HTML)/$(lang)/MPlayer.html:
 	./xsltproc.sh $$@ html-single.xsl $$<

Modified: trunk/DOCS/xml/configure
==============================================================================
--- trunk/DOCS/xml/configure	Wed Jun 23 14:38:40 2010	(r31536)
+++ trunk/DOCS/xml/configure	Wed Jun 23 15:24:53 2010	(r31537)
@@ -181,13 +181,11 @@ then
   if test -z "$_fake_chunk_xsl"
   then
     echo "Found xsltproc. If it works, it's probably the best choice."
-    # HACK: xslt always need a target file if a doctype is set
-    _xsltcommand="OUTPUT=\"\$1\"; if test -d \"\$OUTPUT\" ; then OUTPUT=\"\$OUTPUT/dummy.html\" ; fi;"
     if test -n "$_catalog"
     then
-      _xsltcommand="$_xsltcommand xsltproc --catalogs -o \$OUTPUT \$2 \$3"
+      _xsltcommand="xsltproc --catalogs -o \$1 \$2 \$3"
     else
-      _xsltcommand="$_xsltcommand xsltproc -o \$OUTPUT \$2 \$3"
+      _xsltcommand="xsltproc -o \$1 \$2 \$3"
     fi
   else
     echo "Found xsltproc but no stylesheets on your system."

    