[master] fix python script versions

4257. [cleanup] Python scripts reported incorrect version. [RT #41080]
2025-09-02 07:35:26 +00:00 · 2015-11-08 21:34:24 -08:00
parent 58021df889
commit e13d04fda9
69 changed files with 78 additions and 80 deletions
--- a/2
+++ b/2
@@ -1,3 +1,5 @@
+4257.	[cleanup]	Python scripts reported incorrect version. [RT #41080]
+
 4256.	[bug]		Allow rndc command arguments to be quoted so as
 			to allow spaces. [RT #36665]

--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 SUBDIRS =	make unit lib bin doc
 TARGETS =
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/delv/Makefile.in
+++ b/bin/delv/Makefile.in
@@ -16,7 +16,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -17,7 +17,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_PRODUCT@

--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/python/dnssec-checkds.py.in
+++ b/bin/python/dnssec-checkds.py.in
@@ -303,7 +303,8 @@ def parse_args():
                        default=os.path.join(prefix(sbindir),
                                             'dnssec-dsfromkey'),
                        type=str, help='path to \'dig\'')
-    parser.add_argument('-v', '--version', action='version', version='9.9.1')
+    parser.add_argument('-v', '--version', action='version',
+                        version='@BIND9_VERSION@')
    args = parser.parse_args()

    args.zone = args.zone.strip('.')
--- a/bin/python/dnssec-coverage.py.in
+++ b/bin/python/dnssec-coverage.py.in
@@ -694,7 +694,8 @@ def parse_args():
    parser.add_argument('-D', '--debug', dest='debug_mode',
                        action='store_true', default=False,
                        help='Turn on debugging output')
-    parser.add_argument('-v', '--version', action='version', version='9.9.1')
+    parser.add_argument('-v', '--version', action='version',
+                        version='@BIND9_VERSION@')

    args = parser.parse_args()

--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/builtin/Makefile.in
+++ b/bin/tests/system/builtin/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/dlzexternal/Makefile.in
+++ b/bin/tests/system/dlzexternal/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/dyndb/Makefile.in
+++ b/bin/tests/system/dyndb/Makefile.in
@@ -16,7 +16,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/filter-aaaa/Makefile.in
+++ b/bin/tests/system/filter-aaaa/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/geoip/Makefile.in
+++ b/bin/tests/system/geoip/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/lwresd/Makefile.in
+++ b/bin/tests/system/lwresd/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/pipelined/Makefile.in
+++ b/bin/tests/system/pipelined/Makefile.in
@@ -16,7 +16,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/resolver/Makefile.in
+++ b/bin/tests/system/resolver/Makefile.in
@@ -16,7 +16,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/rndc/Makefile.in
+++ b/bin/tests/system/rndc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/rpz/Makefile.in
+++ b/bin/tests/system/rpz/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/rsabigexponent/Makefile.in
+++ b/bin/tests/system/rsabigexponent/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/statistics/Makefile.in
+++ b/bin/tests/system/statistics/Makefile.in
@@ -16,7 +16,7 @@ srcdir=	@srcdir@
 VPATH=		@srcdir@
 top_srcdir=	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tests/system/tsiggss/Makefile.in
+++ b/bin/tests/system/tsiggss/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/7
+++ b/7
@@ -21242,7 +21242,7 @@ BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""

 BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""

-BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}"
+BIND9_VERSION="${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}"

 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"

@@ -22470,7 +22470,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #

-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/builtin/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/resolver/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/statistics/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/builtin/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/resolver/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/statistics/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"


 #
@@ -23541,6 +23541,9 @@ do
    "contrib/scripts/zone-edit.sh") CONFIG_FILES="$CONFIG_FILES contrib/scripts/zone-edit.sh" ;;
    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
    "doc/arm/Makefile") CONFIG_FILES="$CONFIG_FILES doc/arm/Makefile" ;;
+    "doc/arm/noteversion.xml") CONFIG_FILES="$CONFIG_FILES doc/arm/noteversion.xml" ;;
+    "doc/arm/pkgversion.xml") CONFIG_FILES="$CONFIG_FILES doc/arm/pkgversion.xml" ;;
+    "doc/arm/releaseinfo.xml") CONFIG_FILES="$CONFIG_FILES doc/arm/releaseinfo.xml" ;;
    "doc/doxygen/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/doxygen/Doxyfile" ;;
    "doc/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES doc/doxygen/Makefile" ;;
    "doc/doxygen/doxygen-input-filter") CONFIG_FILES="$CONFIG_FILES doc/doxygen/doxygen-input-filter" ;;
--- a/configure.in
+++ b/configure.in
@@ -4371,7 +4371,7 @@ BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 AC_SUBST(BIND9_PRODUCT)
 BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
 AC_SUBST(BIND9_DESCRIPTION)
-BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}"
+BIND9_VERSION="${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}"
 AC_SUBST(BIND9_VERSION)
 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
 AC_SUBST(BIND9_MAJOR)
@@ -4808,6 +4808,9 @@ AC_CONFIG_FILES([
 	contrib/scripts/zone-edit.sh
 	doc/Makefile
 	doc/arm/Makefile
+        doc/arm/noteversion.xml
+        doc/arm/pkgversion.xml
+        doc/arm/releaseinfo.xml
 	doc/doxygen/Doxyfile
 	doc/doxygen/Makefile
 	doc/doxygen/doxygen-input-filter
--- a/contrib/dlz/bin/dlzbdb/Makefile.in
+++ b/contrib/dlz/bin/dlzbdb/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -19,10 +19,6 @@ top_srcdir =	@top_srcdir@

@BIND9_MAKE_RULES@

-@BIND9_VERSION@
-
-PKGVERSION = @PACKAGE_VERSION@
-
 MANOBJS = Bv9ARM.html notes.html

 PDFOBJS = Bv9ARM.pdf notes.pdf
@@ -64,14 +60,3 @@ Bv9ARM.pdf: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml noteversion.xml
 	expand Bv9ARM-book.xml | \
 	${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl - | \
 	${DBLATEX} -c Bv9ARM.conf -o Bv9ARM.pdf -
-
-FORCE:
-
-releaseinfo.xml: FORCE
-	echo >$@ '<releaseinfo>BIND Version ${VERSION}</releaseinfo>'
-
-noteversion.xml: FORCE
-	echo >$@ '<title>Release Notes for BIND Version ${VERSION}</title>'
-
-pkgversion.xml: FORCE
-	echo >$@ '      <para>This version of the manual corresponds to BIND version ${PKGVERSION}.</para>'
--- a/doc/arm/noteversion.xml.in
+++ b/doc/arm/noteversion.xml.in
@@ -0,0 +1 @@
+<title>Release Notes for BIND Version @BIND9_VERSION@</title>
--- a/doc/arm/pkgversion.xml.in
+++ b/doc/arm/pkgversion.xml.in
@@ -0,0 +1 @@
+      <para>This version of the manual corresponds to BIND version @PACKAGE_VERSION@.</para>
--- a/doc/arm/releaseinfo.xml.in
+++ b/doc/arm/releaseinfo.xml.in
@@ -0,0 +1 @@
+<releaseinfo>BIND Version @BIND9_VERSION@</releaseinfo>
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -23,7 +23,7 @@ TARGETS =

@BIND9_MAKE_RULES@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 # Until and unless we decide to ship all umptyzillion Doxygen output
 # files, distclean for this directory implies docclean.
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -74,7 +74,7 @@ while test $# -gt 0; do
 		echo_exec_prefix=true
 		;;
 	--version)
-		echo @BIND9_VERSION@
+		echo VERSION=@BIND9_VERSION@
 		exit 0
 		;;
 	--cflags)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@LIBBIND9_API@

--- a/lib/bind9/include/bind9/Makefile.in
+++ b/lib/bind9/include/bind9/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 #
 # Only list headers that are to be installed and are not
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -21,7 +21,7 @@ top_srcdir =	@top_srcdir@
 .NOTPARALLEL:
 .NO_PARALLEL:

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@
@BIND9_MAJOR@

@LIBDNS_MAPAPI@
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -17,7 +17,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	acache.h acl.h adb.h badcache.h bit.h byaddr.h \
 		cache.h callbacks.h cert.h \
--- a/lib/dns/include/dst/Makefile.in
+++ b/lib/dns/include/dst/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	dst.h gssapi.h lib.h result.h

--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -22,7 +22,7 @@ top_srcdir =	@top_srcdir@
 .NOTPARALLEL:
 .NO_PARALLEL:

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@LIBIRS_API@

--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -17,7 +17,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@LIBISC_API@

--- a/lib/isc/alpha/include/isc/Makefile.in
+++ b/lib/isc/alpha/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isc/ia64/include/isc/Makefile.in
+++ b/lib/isc/ia64/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -17,7 +17,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 #
 # Only list headers that are to be installed and are not
--- a/lib/isc/include/pk11/Makefile.in
+++ b/lib/isc/include/pk11/Makefile.in
@@ -16,7 +16,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 #
 # Only list headers that are to be installed and are not
--- a/lib/isc/include/pkcs11/Makefile.in
+++ b/lib/isc/include/pkcs11/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 #
 # Only list headers that are to be installed and are not
--- a/lib/isc/mips/include/isc/Makefile.in
+++ b/lib/isc/mips/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isc/noatomic/include/isc/Makefile.in
+++ b/lib/isc/noatomic/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isc/nothreads/include/isc/Makefile.in
+++ b/lib/isc/nothreads/include/isc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	condition.h mutex.h once.h thread.h

--- a/lib/isc/powerpc/include/isc/Makefile.in
+++ b/lib/isc/powerpc/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	condition.h mutex.h once.h thread.h

--- a/lib/isc/sparc64/include/isc/Makefile.in
+++ b/lib/isc/sparc64/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -22,7 +22,7 @@ top_srcdir =	@top_srcdir@
 .NOTPARALLEL:
 .NO_PARALLEL:

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	dir.h int.h keyboard.h net.h netdb.h offset.h stat.h \
 		stdtime.h strerror.h syslog.h time.h
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	dir.h int.h keyboard.h mutex.h net.h netdb.h once.h \
 		stat.h stdtime.h thread.h time.h
--- a/lib/isc/x86_32/include/isc/Makefile.in
+++ b/lib/isc/x86_32/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isc/x86_64/include/isc/Makefile.in
+++ b/lib/isc/x86_64/include/isc/Makefile.in
@@ -18,7 +18,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 HEADERS =	atomic.h

--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@LIBISCCC_API@

--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 #
 # Only list headers that are to be installed and are not
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@LIBISCCFG_API@

--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 #
 # Only list headers that are to be installed and are not
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@LIBLWRES_API@

--- a/lib/lwres/man/Makefile.in
+++ b/lib/lwres/man/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_RULES@

--- a/lib/lwres/tests/Makefile.in
+++ b/lib/lwres/tests/Makefile.in
@@ -22,7 +22,7 @@ top_srcdir =	@top_srcdir@
 .NOTPARALLEL:
 .NO_PARALLEL:

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/lib/samples/Makefile.in
+++ b/lib/samples/Makefile.in
@@ -16,7 +16,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

@BIND9_MAKE_INCLUDES@

--- a/lib/tests/include/tests/Makefile.in
+++ b/lib/tests/include/tests/Makefile.in
@@ -19,7 +19,7 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@

-@BIND9_VERSION@
+VERSION=@BIND9_VERSION@

 SUBDIRS =
 TARGETS =
				`@@ -0,0 +1 @@`
				`<title>Release Notes for BIND Version @BIND9_VERSION@</title>`
				`@@ -0,0 +1 @@`
				`<para>This version of the manual corresponds to BIND version @PACKAGE_VERSION@.</para>`
				`@@ -0,0 +1 @@`
				`<releaseinfo>BIND Version @BIND9_VERSION@</releaseinfo>`