changeset 31471:da0291f41eb7

Move xsltproc target file hack to the Makefile.
author diego
date Wed, 23 Jun 2010 13:24:53 +0000
parents 7c10f547ce96
children f5b66007c5e1
files DOCS/xml/Makefile DOCS/xml/configure
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/Makefile	Wed Jun 23 12:38:40 2010 +0000
+++ b/DOCS/xml/Makefile	Wed Jun 23 13:24:53 2010 +0000
@@ -35,16 +35,16 @@
 	./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 $$<
--- a/DOCS/xml/configure	Wed Jun 23 12:38:40 2010 +0000
+++ b/DOCS/xml/configure	Wed Jun 23 13:24:53 2010 +0000
@@ -181,13 +181,11 @@
   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."