hal: Branch 'master'

[David Zeuthen]

 doc/spec/Makefile.am |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

New commits:
diff-tree 89d144da2f8cf835532fda85315762f34fcfcaf4 (from 5fb4263f3267cc34964e67a4c0ce2d45476eed10)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 26 21:08:53 2007 -0400

    fix build rules for spec

diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am
index e482f6e..646110e 100644
--- a/doc/spec/Makefile.am
+++ b/doc/spec/Makefile.am
@@ -15,15 +15,14 @@ if DOCBOOK_DOCS_ENABLED
 htmldocdir = $(DOCDIR)/spec
 htmldoc_DATA = hal-spec.html $(FIGURE_FILES) docbook.css
 
-hal-spec.html : hal-spec.xml $(SPEC_XML_EXTRA_FILES) $(FIGURE_FILES)
-	${XMLLINT} --xinclude hal-spec.xml > ~hal-spec.xml || rm -f ~hal-spec.xml
-	mv -f ~hal-spec.xml hal-spec.xml
-	$(XMLTO) html-nochunks -m config.xsl hal-spec.xml  || rm -f hal-spec.xml
-	rm -f hal-spec.xml
+hal-spec.html : hal-spec.xml.in $(FIGURE_FILES) $(SPEC_XML_EXTRA_FILES)
+	${XMLLINT} --xinclude hal-spec.xml.in > hal-spec.xml
+	$(XMLTO) html-nochunks -m config.xsl hal-spec.xml
 
 clean-local:
 	rm -f *~
-	rm -f *.html hal-spec.xml
+	rm -f *.html
+	rm -f hal-spec.xml
 
 endif # DOCBOOK_DOCS_ENABLED