Added step to zip-ns target to cause it fix the catalog.xml file

such that it maps the canonical URIs for the xsl-ns distribution
(instead of the non-namespaced xsl distribution).

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index b5438bccebb9860eb6374ff0aea55be6a51d1ea9..35d01adc36e6731721114b2b3024c0d18449b469 100644 (file)
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -34,6 +34,13 @@ zip-ns: zip
        sed -i "s/^\(.*\)<xsl:param name=\"DistroName\">docbook-xsl<\/xsl:param>$$/\1<xsl:param name=\"DistroName\">docbook-xsl-ns<\/xsl:param>/" \
          $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/VERSION
 
+# fix catalog.xml file
+       $(XSLT) .make-catalog.xsl .make-catalog.xsl \
+         DISTRO="$(DISTRO)-ns" BRANCH="XSL-NS" \
+         | $(XMLLINT) $(XMLLINT_OPTS) --format - \
+         | grep -v "<?xml" \
+         > $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/catalog.xml
+
 # repair perms
        chmod 755 $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/fo/pdf2index
        chmod 755 $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/install.sh