From: Evan Hunt <each@isc.org>
Date: Thu, 4 Sep 2014 03:30:46 +0000 (-0700)
Subject: [v9_8] add version number to ARM
X-Git-Tag: v9.8.8rc2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df762675f11f9fca13fc10e7a95a5cccff91dfda;p=thirdparty%2Fbind9.git

[v9_8] add version number to ARM

3941.	[doc]		Include the BIND version number in the ARM. [RT #37067]

(cherry picked from commit 7ae9399897c55d35cb6764277bce4b91d052e0dc)
(cherry picked from commit 8cd1082584b5a2e69dc6f551ace995ca0f85f96b)
(cherry picked from commit d0c4884c8608dad3cd24e2fd7bead31c5c5608c2)
---

diff --git a/CHANGES b/CHANGES
index 3e2da69f820..59580a463a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3941.	[doc]		Include the BIND version number in the ARM. [RT #37067]
+
 	--- 9.8.8rc1 released ---
 
 3933.	[bug]		Corrected the implementation of dns_rdata_casecompare()
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index b26a8b52f64..95bbae91175 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -43,6 +43,7 @@
       <year>2003</year>
       <holder>Internet Software Consortium.</holder>
     </copyright>
+    <xi:include href="releaseinfo.xml"/>
   </bookinfo>
 
   <chapter id="Bv9ARM.ch01">
diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 3ecf4af90bb..e1f7514473c 100644
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -67,5 +67,7 @@ Bv9ARM.pdf: Bv9ARM.tex releaseinfo.xml
 	${PDFLATEX} '\batchmode\input Bv9ARM.tex' || (rm -f $@ ; exit 1)
 	${PDFLATEX} '\batchmode\input Bv9ARM.tex' || (rm -f $@ ; exit 1)
 
-releaseinfo.xml:
+FORCE:
+
+releaseinfo.xml: FORCE
 	echo >$@ '<releaseinfo>BIND Version ${VERSION}</releaseinfo>'
diff --git a/doc/xsl/isc-docbook-chunk.xsl.in b/doc/xsl/isc-docbook-chunk.xsl.in
index a766c05336e..c136b112664 100644
--- a/doc/xsl/isc-docbook-chunk.xsl.in
+++ b/doc/xsl/isc-docbook-chunk.xsl.in
@@ -56,6 +56,10 @@
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
 
+  <xsl:template name="user.footer.navigation">
+    <p style="text-align: center;">BIND Version @PACKAGE_VERSION@</p>
+  </xsl:template>
+
 </xsl:stylesheet>
 
 <!-- 
diff --git a/doc/xsl/isc-docbook-html.xsl.in b/doc/xsl/isc-docbook-html.xsl.in
index ecc0f67c714..e8a75f53526 100644
--- a/doc/xsl/isc-docbook-html.xsl.in
+++ b/doc/xsl/isc-docbook-html.xsl.in
@@ -49,6 +49,10 @@
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
 
+  <xsl:template name="user.footer.navigation">
+    <p style="text-align: center;">BIND Version @PACKAGE_VERSION@</p>
+  </xsl:template>
+
 </xsl:stylesheet>
 
 <!--