From: Evan Hunt <each@isc.org>
Date: Fri, 5 Sep 2014 19:18:45 +0000 (-0700)
Subject: [v9_9] add package version to scope statement
X-Git-Tag: v9.9.6rc2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9002937bf404683765c1ccd03f5d34b1e64846ff;p=thirdparty%2Fbind9.git

[v9_9] add package version to scope statement
---

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index a523ada49ed..c16dd568f22 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -71,12 +71,9 @@
 	<acronym>BIND</acronym> version 9 software package for
 	system administrators.
       </para>
-
-      <para>
-	This version of the manual corresponds to BIND version 9.9.
-      </para>
-
+      <xi:include href="pkgversion.xml"/>
     </sect1>
+
     <sect1>
       <title>Organization of This Document</title>
       <para>
diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 0ad8a7ef582..5bae2b2e47a 100644
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -23,6 +23,8 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_VERSION@
 
+PKGVERSION = @PACKAGE_VERSION@
+
 MANOBJS = Bv9ARM.html
 
 PDFOBJS = Bv9ARM.pdf
@@ -38,30 +40,31 @@ docclean manclean maintainer-clean:: clean
 
 docclean manclean maintainer-clean distclean::
 	rm -f releaseinfo.xml
+	rm -f pkgversion.xml
 
-Bv9ARM.html: Bv9ARM-book.xml releaseinfo.xml
+Bv9ARM.html: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml
 	expand Bv9ARM-book.xml | \
 	${XSLTPROC} --stringparam root.filename Bv9ARM \
 		${top_srcdir}/doc/xsl/isc-docbook-chunk.xsl -
 
-Bv9ARM-all.html: Bv9ARM-book.xml releaseinfo.xml
+Bv9ARM-all.html: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml
 	expand Bv9ARM-book.xml | \
 	${XSLTPROC} -o Bv9ARM-all.html ../xsl/isc-docbook-html.xsl -
 
-Bv9ARM.tex: Bv9ARM-book.xml releaseinfo.xml
+Bv9ARM.tex: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml
 	expand Bv9ARM-book.xml | \
 	${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl - | \
 	${XSLTPROC} ${top_srcdir}/doc/xsl/isc-docbook-latex.xsl - | \
 	@PERL@ latex-fixup.pl >$@.tmp 
 	if test -s $@.tmp; then mv $@.tmp $@; else rm -f $@.tmp; exit 1; fi
 
-Bv9ARM.dvi: Bv9ARM.tex releaseinfo.xml
+Bv9ARM.dvi: Bv9ARM.tex releaseinfo.xml pkgversion.xml
 	rm -f Bv9ARM-book.aux Bv9ARM-book.dvi Bv9ARM-book.log
 	${LATEX} '\batchmode\input Bv9ARM.tex' || (rm -f $@ ; exit 1)
 	${LATEX} '\batchmode\input Bv9ARM.tex' || (rm -f $@ ; exit 1)
 	${LATEX} '\batchmode\input Bv9ARM.tex' || (rm -f $@ ; exit 1)
 
-Bv9ARM.pdf: Bv9ARM.tex releaseinfo.xml
+Bv9ARM.pdf: Bv9ARM.tex releaseinfo.xml pkgversion.xml
 	rm -f Bv9ARM-book.aux Bv9ARM-book.pdf Bv9ARM-book.log
 	${PDFLATEX} '\batchmode\input Bv9ARM.tex' || (rm -f $@ ; exit 1)
 	${PDFLATEX} '\batchmode\input Bv9ARM.tex' || (rm -f $@ ; exit 1)
@@ -71,3 +74,6 @@ FORCE:
 
 releaseinfo.xml: FORCE
 	echo >$@ '<releaseinfo>BIND Version ${VERSION}</releaseinfo>'
+
+pkgversion.xml: FORCE
+	echo >$@ '      <para>This version of the manual corresponds to BIND version ${PKGVERSION}.</para>'