[PATCH 3/5 v3] Show Xserver release/version date in DIX & DDX docs

[Alan Coopersmith]

Uses a catalog file to provide the path to an entity file in a
different directory than the xml sources.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac                   |    2 ++
 doc/xml/Makefile.am            |    5 ++++-
 doc/xml/Xserver-spec.xml       |    4 +++-
 doc/xml/xmlrules.in            |   16 ++++++++++++----
 hw/xfree86/doc/sgml/DESIGN.xml |    4 +++-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3c7a8de..5fc6d35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2147,6 +2147,7 @@ AC_TRY_COMPILE([
 
 AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
 
+AC_SUBST([RELEASE_DATE])
 BUILD_DATE="`date +'%Y%m%d'`"
 AC_SUBST([BUILD_DATE])
 BUILD_TIME="`date +'1%H%M%S'`"
@@ -2170,6 +2171,7 @@ dbe/Makefile
 dix/Makefile
 doc/Makefile
 doc/xml/Makefile
+doc/xml/xserver.ent
 fb/Makefile
 record/Makefile
 config/Makefile
diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
index df4833c..f3b0aa3 100644
--- a/doc/xml/Makefile.am
+++ b/doc/xml/Makefile.am
@@ -28,6 +28,9 @@ include xmlrules.in
 if ENABLE_DEVEL_DOCS
 noinst_DATA = $(BUILT_DOC_FILES)
 endif
-CLEANFILES = $(CLEAN_DOC_FILES)
+CLEANFILES = $(CLEAN_DOC_FILES) catalog
 
 EXTRA_DIST = $(XML_FILES)
+
+catalog:
+	$(AM_V_GEN)echo 'SYSTEM "xserver.ent" "$(abs_builddir)/xserver.ent"' > $@
diff --git a/doc/xml/Xserver-spec.xml b/doc/xml/Xserver-spec.xml
index 8691f18..5ce13c9 100644
--- a/doc/xml/Xserver-spec.xml
+++ b/doc/xml/Xserver-spec.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+ <!ENTITY % defs SYSTEM "xserver.ent"> %defs;
 ]>
 
 <article>
@@ -38,7 +39,8 @@
       <affiliation><orgname>X.org Foundation and Hewlett Packard</orgname></affiliation>
     </author>
     <publisher><publishername>The X.Org Foundation</publishername></publisher>
-    <pubdate>2004</pubdate>
+    <pubdate>&xserver.reldate;</pubdate>
+    <releaseinfo>X server version &xserver.version;</releaseinfo>
     <title>Definition of the Porting Layer for the X v11 Sample Server</title>
     <titleabbrev>X Porting Layer</titleabbrev>
     <revhistory>
diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in
index b5856f7..e9d0e43 100644
--- a/doc/xml/xmlrules.in
+++ b/doc/xml/xmlrules.in
@@ -36,26 +36,34 @@ BUILT_DOC_FILES =
 
 SUFFIXES = .xml .txt .html .pdf
 
+XML_ENT_DIR = $(top_builddir)/doc/xml
+DOCBOOK_FLAGS = --cat $(XML_ENT_DIR)/catalog
+
 if BUILD_TXTDOC
 BUILT_DOC_FILES += $(TXT_FILES)
 .xml.txt:
 	@rm -f $@
-	$(AM_V_GEN)$(MAKE_TEXT) $<
+	$(AM_V_GEN)$(MAKE_TEXT) $(DOCBOOK_FLAGS) $<
 endif
 
 if BUILD_HTMLDOC
 BUILT_DOC_FILES += $(HTML_FILES)
 .xml.html:
 	@rm -f $@
-	$(AM_V_GEN)$(MAKE_HTML) -u $<
+	$(AM_V_GEN)$(MAKE_HTML) $(DOCBOOK_FLAGS) -u $<
 endif
 
 if BUILD_PDFDOC
 BUILT_DOC_FILES += $(PDF_FILES)
 .xml.pdf:
 	@rm -f $@
-	$(AM_V_GEN)$(MAKE_PDF) $<
+	$(AM_V_GEN)$(MAKE_PDF) $(DOCBOOK_FLAGS) $<
 endif
 
-
 CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES)
+
+# All the files we build depend on the entities & catalog
+$(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent $(XML_ENT_DIR)/catalog
+
+$(XML_ENT_DIR)/xserver.ent $(XML_ENT_DIR)/catalog:
+	(cd $(XML_ENT_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@F))
diff --git a/hw/xfree86/doc/sgml/DESIGN.xml b/hw/xfree86/doc/sgml/DESIGN.xml
index 0613359..639e92c 100644
--- a/hw/xfree86/doc/sgml/DESIGN.xml
+++ b/hw/xfree86/doc/sgml/DESIGN.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+ <!ENTITY % defs SYSTEM "xserver.ent"> %defs;
  <!-- config file keyword markup -->
  <!-- specific config file keywords -->
  <!ENTITY k.device "<emphasis>Device</emphasis>">
@@ -29,7 +30,8 @@
       </othercredit>
     </authorgroup>
 
-    <pubdate>19 December 2003</pubdate>
+    <pubdate>&xserver.reldate;</pubdate>
+    <releaseinfo>Xorg server version &xserver.version;</releaseinfo>
 
   </articleinfo>
 
-- 
1.5.6.5