hal/doc/spec Makefile.am,1.12,1.13

[Danny Kukawka]

Update of /cvs/hal/hal/doc/spec
In directory kemper:/tmp/cvs-serv15521/doc/spec

Modified Files:
	Makefile.am 
Log Message:
2006-07-24  Danny Kukawka  <danny.kukawka at web.de>

        Fixed build hal-spec.html to avoid invalid chars in the html page and
        closed fd.o bug #6986:

        * configure.in: replaced check for xmlto with old check for
        docbook2html and additional check for xmllint

        * doc/spec/Makefile.am: added xmllint to resolve xinclude for docbook,
        readded docbook2html command



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/spec/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	6 Jun 2006 16:03:45 -0000	1.12
+++ Makefile.am	24 Jul 2006 11:49:16 -0000	1.13
@@ -19,7 +19,8 @@
 htmldoc_DATA = hal-spec.html $(FIGURE_FILES)
 
 hal-spec.html : hal-spec.xml $(SPEC_XML_EXTRA_FILES) $(FIGURE_FILES)
-	$(XMLTO) html-nochunks -m config.xsl hal-spec.xml
+	${XMLLINT} --xinclude hal-spec.xml.in > hal-spec.xml 
+	$(DOCBOOK) --nochunks hal-spec.xml -o .
 
 clean-local:
 	rm -f *~