From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Wed, 9 Jan 2008 11:15:51 +0000 (+0000)
Subject: Make sure to remove RELEASE-NOTES-TMP.xml after build of HTML for
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6421241d2426cb69a2a746a8cc76e3caf42eeec1;p=docbook-dsssl

Make sure to remove RELEASE-NOTES-TMP.xml after build of HTML for
release notes; when building catalog.xml file, use --output flag
with xmllint instead of shell redirect (because catalog.xml build
seems to be choking otherwise...)
---

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 655304156..76344bb42 100644
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -12,6 +12,7 @@ RELEASE-NOTES.html: RELEASE-NOTES.xml NEWS.xml
 	$(XSLT) RELEASE-NOTES-TMP.xml $(DOC_LINK_STYLE) $@ \
 	doc-baseuri="$(DOC_BASEURI)" \
 	profile.condition="$(RELEASE_TYPE)"
+	$(RM) RELEASE-NOTES-TMP.xml
 
 RELEASE-NOTES.txt: RELEASE-NOTES.html
 	LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
@@ -98,7 +99,7 @@ ChangeHistory.xml:
 
 catalog.xml: .make-catalog.xsl
 	$(XSLT) $< $< DISTRO="$(DISTRO)" \
-	  | $(XMLLINT) $(XMLLINT_OPTS) --format --encode utf-8 - > $@
+	  | $(XMLLINT) $(XMLLINT_OPTS) --format --encode utf-8 --output $@ -
 
 install.sh: $(INSTALL_SH) .CatalogManager.properties.example .urilist catalog.xml
 	cp $< $@