From 637ff32dc7b8bd6f1dfb175190c41e25c4ee146e Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Fri, 2 Sep 2005 06:50:52 +0000
Subject: [PATCH] Removed catalog.xml from version control and updated build to
 automatically generate it. (To ensure it always contains the correct version
 number for the release.) Thanks to John L. Clark for the suggestion.

---
 releasetools/Targets.mk     |  3 +++
 xsl/.cvsignore              |  1 +
 xsl/catalog.xml             | 12 ------------
 xsl/common/make-catalog.xsl | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 12 deletions(-)
 delete mode 100644 xsl/catalog.xml
 create mode 100644 xsl/common/make-catalog.xsl

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 5b3bb4c56..cdeebcb27 100644
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -24,6 +24,9 @@ RELEASE-NOTES.pdf: RELEASE-NOTES.xml
 install.sh: .CatalogManager.properties.example .urilist
 	cp -p $(INSTALL_SH) install.sh
 
+catalog.xml: $(DISTRIB_MAKECATALOG)
+	$(XSLT) -output catalog.xml $(DISTRIB_MAKECATALOG) $(DISTRIB_MAKECATALOG)
+
 distrib: all $(DISTRIB_DEPENDS) RELEASE-NOTES.txt RELEASE-NOTES.pdf $(NEWSFILE) install.sh
 
 $(NEWSFILE):
diff --git a/xsl/.cvsignore b/xsl/.cvsignore
index 17fa76249..50769dccc 100644
--- a/xsl/.cvsignore
+++ b/xsl/.cvsignore
@@ -7,5 +7,6 @@ RELEASE-NOTES.fo
 .urilist
 NEWS
 install.sh
+catalog.xml
 slides
 website
diff --git a/xsl/catalog.xml b/xsl/catalog.xml
deleted file mode 100644
index 0d5eeb88f..000000000
--- a/xsl/catalog.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-<!--  XML Catalog file for DocBook XSL Stylesheets distribution -->
-
-  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
-  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
-
-  <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
-  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
-
-</catalog>
diff --git a/xsl/common/make-catalog.xsl b/xsl/common/make-catalog.xsl
new file mode 100644
index 000000000..97de15ce1
--- /dev/null
+++ b/xsl/common/make-catalog.xsl
@@ -0,0 +1,37 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'>
+
+<xsl:output indent="yes"/>
+
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     and other information.
+
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
+<xsl:include href="../VERSION"/>
+
+<xsl:template match="/">
+
+  <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <xsl:text>&#10;</xsl:text>
+    <xsl:comment>  XML Catalog file for DocBook XSL Stylesheets distribution </xsl:comment>
+
+    <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+    <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+
+    <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/{$VERSION}/" rewritePrefix="./"/>
+    <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/{$VERSION}/" rewritePrefix="./"/>
+
+  </catalog>
+
+</xsl:template>
+
+</xsl:stylesheet>
-- 
2.40.0