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 655304156d8b7531450276aa9a2c61ad4e32f0e8..76344bb42de64e205a24aa7882dc99f9dc522df7 100644 (file)
--- 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 $< $@