confuse-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Confuse-devel] [PATCH] build: workaround xmlto/xsltproc bug that fails


From: Carlo Marcelo Arenas Belon
Subject: [Confuse-devel] [PATCH] build: workaround xmlto/xsltproc bug that fails distcheck
Date: Sun, 4 Jul 2010 06:55:39 -0700

when building the documentation out of tree, xmlto will be unable to
merge the generated entities with the tutorial if not on the same dir.

before calling xmllint, copy tutorial.xml to the working directory and
create a tutorial.rm flag so it can be later removed.

Signed-off-by: Carlo Marcelo Arenas Belon <address@hidden>
---
 doc/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d892d5d..01117b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,9 @@ TUTORIAL_LISTINGS = $(TUTORIAL_CSOURCES:.c=.xml)
        echo ']]></programlisting>' >> $@
 
 tutorial-html/index.html: tutorial.xml $(TUTORIAL_LISTINGS) css.xsl 
tutorial.css
-       xmllint --valid --noout --path . $< && xmlto -v --searchpath . -o 
tutorial-html --extensions -m $(top_srcdir)/doc/css.xsl xhtml $<
+       cp -f $(top_srcdir)/doc/tutorial.xml . && touch tutorial.rm || true
+       xmllint --valid --noout --path . ./tutorial.xml && xmlto -v 
--searchpath . -o tutorial-html --extensions -m $(top_srcdir)/doc/css.xsl xhtml 
./tutorial.xml
+       \rm tutorial.rm && rm -f tutorial.xml || true
        cp -f $(top_srcdir)/doc/tutorial.css tutorial-html/
 
 tutorial.pdf: tutorial.xml $(TUTORIAL_LISTINGS)
-- 
1.7.1.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]