From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Wed, 29 Aug 2007 15:38:27 +0000 (+0000)
Subject: Make sure that catalog.xml files has an XML declaration. Also, set
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61ac193cbd4a6ab767553e3d164ec67b5163a1e1;p=docbook-dsssl

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 f85063650..9061a2d82 100644
--- 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 8a8c3ff4a..b2af0dea5 100644
--- 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) \