Make sure that catalog.xml files has an XML declaration. Also, set

executable perms on the xsl-ns/tools/bin/docbook-update file.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index f8506365069791e020610469bbd3ee169a53f0a8..9061a2d827f2c1d2ba087c430d6e5fc2c25e02fb 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -96,7 +96,8 @@ ChangeHistory.xml:
        cp $< $@
 
 catalog.xml: .make-catalog.xsl
-       $(XSLT) $< $< $@ DISTRO="$(DISTRO)"
+       $(XSLT) $< $< DISTRO="$(DISTRO)" \
+         | $(XMLLINT) $(XMLLINT_OPTS) --format --encode utf-8 - > $@
 
 install.sh: $(INSTALL_SH) .CatalogManager.properties.example .urilist catalog.xml
        cp $< $@

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index 8a8c3ff4ac2c1252a6e916e8dd1dce8c34ddd208..b2af0dea5aa1fb2c9cde8244a6aa2d9524bdf200 100644 (file)
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -37,13 +37,13 @@ zip-ns: zip
 # fix catalog.xml file
        $(XSLT) .make-catalog.xsl .make-catalog.xsl \
          DISTRO="$(DISTRO)-ns" BRANCH="XSL-NS" \
-         | $(XMLLINT) $(XMLLINT_OPTS) --format - \
-         | grep -v "<?xml" \
+         | $(XMLLINT) $(XMLLINT_OPTS) --format --encode utf-8 - \
          > $(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
+       chmod 755 $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/tools/bin/docbook-xsl-update
 
 # gzip/bzip/zip it
        umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-ns-$(ZIPVER) \