diff --git a/CHANGES b/CHANGES
index c8c4fb4513..7c02d40f4c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/Makefile.in b/Makefile.in
index e6d2699df0..b5a0b2ad62 100644
--- 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 =
diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index b88be3cb85..5db667186d 100644
--- 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@
diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 409dffd1c6..176ce54af7 100644
--- 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@
diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
index 7569bd7fe4..5a59cf5392 100644
--- 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@
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 730f1b57ef..b5f2344931 100644
--- 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@
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 4f1bf9095d..4409100fbe 100644
--- 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@
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 899756a1de..05810bcac8 100644
--- 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@
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index 5dc20ad907..4ac3331ca0 100644
--- 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@
diff --git a/bin/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
index 3a66ee24b4..d821c097ce 100644
--- 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('.')
diff --git a/bin/python/dnssec-coverage.py.in b/bin/python/dnssec-coverage.py.in
index 39ec549ec9..ccd01a9cc1 100755
--- 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()
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 8d7f38dcd6..8c57d892e6 100644
--- 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@
diff --git a/bin/tests/system/builtin/Makefile.in b/bin/tests/system/builtin/Makefile.in
index 135c1f9cb4..2fb4dcd398 100644
--- 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@
diff --git a/bin/tests/system/dlzexternal/Makefile.in b/bin/tests/system/dlzexternal/Makefile.in
index e2225704ce..5c15df1a24 100644
--- 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@
diff --git a/bin/tests/system/dyndb/Makefile.in b/bin/tests/system/dyndb/Makefile.in
index c7792f2133..f27231309e 100644
--- 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@
diff --git a/bin/tests/system/filter-aaaa/Makefile.in b/bin/tests/system/filter-aaaa/Makefile.in
index 3a03de5aaa..8aa47fde15 100644
--- 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@
diff --git a/bin/tests/system/geoip/Makefile.in b/bin/tests/system/geoip/Makefile.in
index 1cf9d4ab80..1b481af091 100644
--- 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@
diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in
index 9623ff91a5..65ba897d92 100644
--- 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@
diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in
index 9d87982dcf..6876ea1f5d 100644
--- 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@
diff --git a/bin/tests/system/resolver/Makefile.in b/bin/tests/system/resolver/Makefile.in
index 995ec2cfe9..4d8a4583b3 100644
--- 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@
diff --git a/bin/tests/system/rndc/Makefile.in b/bin/tests/system/rndc/Makefile.in
index 01df4e6c9a..2e7e6795fa 100644
--- 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@
diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in
index 4042217def..dec82e8216 100644
--- 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@
diff --git a/bin/tests/system/rsabigexponent/Makefile.in b/bin/tests/system/rsabigexponent/Makefile.in
index 0f7f711ebc..5f1fccbc0a 100644
--- 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@
diff --git a/bin/tests/system/statistics/Makefile.in b/bin/tests/system/statistics/Makefile.in
index c1823ad904..4c7d49dea5 100644
--- 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@
diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index b2f40d7999..419052ba73 100644
--- 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@
diff --git a/bin/tests/system/tsiggss/Makefile.in b/bin/tests/system/tsiggss/Makefile.in
index b5124ab101..2aab42a8b3 100644
--- 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@
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index dfc2951b02..831c96aac9 100644
--- 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@
diff --git a/configure b/configure
index 864645b6bd..a683b8d1a0 100755
--- a/configure
+++ b/configure
@@ -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" ;;
diff --git a/configure.in b/configure.in
index cf06cd9ad0..eaf9411cee 100644
--- 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
diff --git a/contrib/dlz/bin/dlzbdb/Makefile.in b/contrib/dlz/bin/dlzbdb/Makefile.in
index 8a4f8c4c79..e9dd88aed7 100644
--- 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@
diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 4b2aa72822..07f1abfc31 100644
--- 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 >$@ 'BIND Version ${VERSION}'
-
-noteversion.xml: FORCE
- echo >$@ 'Release Notes for BIND Version ${VERSION}'
-
-pkgversion.xml: FORCE
- echo >$@ ' This version of the manual corresponds to BIND version ${PKGVERSION}.'
diff --git a/doc/arm/noteversion.xml.in b/doc/arm/noteversion.xml.in
new file mode 100644
index 0000000000..d6bc8de6a6
--- /dev/null
+++ b/doc/arm/noteversion.xml.in
@@ -0,0 +1 @@
+Release Notes for BIND Version @BIND9_VERSION@
diff --git a/doc/arm/pkgversion.xml.in b/doc/arm/pkgversion.xml.in
new file mode 100644
index 0000000000..c0e32dce86
--- /dev/null
+++ b/doc/arm/pkgversion.xml.in
@@ -0,0 +1 @@
+ This version of the manual corresponds to BIND version @PACKAGE_VERSION@.
diff --git a/doc/arm/releaseinfo.xml.in b/doc/arm/releaseinfo.xml.in
new file mode 100644
index 0000000000..facf35e77f
--- /dev/null
+++ b/doc/arm/releaseinfo.xml.in
@@ -0,0 +1 @@
+BIND Version @BIND9_VERSION@
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index ec623986ab..c336635061 100644
--- 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.
diff --git a/isc-config.sh.in b/isc-config.sh.in
index 04a9e5c6f4..056c4875a1 100644
--- 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)
diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index e9e65daa96..648fc7b1a8 100644
--- 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@
diff --git a/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in
index 11ae586205..d531f97a61 100644
--- 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
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 3d3658f303..ee40594ed8 100644
--- 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@
diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 3e9536e53f..f06f338810 100644
--- 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 \
diff --git a/lib/dns/include/dst/Makefile.in b/lib/dns/include/dst/Makefile.in
index cece67dd33..628c160e70 100644
--- 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
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 2416c065f2..427b14677c 100644
--- 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@
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index ba802bf478..cbba88dd33 100644
--- 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@
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 1a58783d31..d3a5de8299 100644
--- 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@
diff --git a/lib/isc/alpha/include/isc/Makefile.in b/lib/isc/alpha/include/isc/Makefile.in
index 4927e210f3..1dd56da4eb 100644
--- 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
diff --git a/lib/isc/ia64/include/isc/Makefile.in b/lib/isc/ia64/include/isc/Makefile.in
index 4927e210f3..1dd56da4eb 100644
--- 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
diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 0a0b0773ae..e27a69117e 100644
--- 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
diff --git a/lib/isc/include/pk11/Makefile.in b/lib/isc/include/pk11/Makefile.in
index 744c40e903..e29713115f 100644
--- 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
diff --git a/lib/isc/include/pkcs11/Makefile.in b/lib/isc/include/pkcs11/Makefile.in
index 6e986886d3..c5ec7a4968 100644
--- 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
diff --git a/lib/isc/mips/include/isc/Makefile.in b/lib/isc/mips/include/isc/Makefile.in
index 4927e210f3..1dd56da4eb 100644
--- 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
diff --git a/lib/isc/noatomic/include/isc/Makefile.in b/lib/isc/noatomic/include/isc/Makefile.in
index 4927e210f3..1dd56da4eb 100644
--- 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
diff --git a/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in
index a2c347eaa2..3180cd5e03 100644
--- 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
diff --git a/lib/isc/powerpc/include/isc/Makefile.in b/lib/isc/powerpc/include/isc/Makefile.in
index 4927e210f3..1dd56da4eb 100644
--- 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
diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index 7cadcf4b6f..b8c802f458 100644
--- 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
diff --git a/lib/isc/sparc64/include/isc/Makefile.in b/lib/isc/sparc64/include/isc/Makefile.in
index 4927e210f3..1dd56da4eb 100644
--- 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
diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 6735e5d930..b418366554 100644
--- 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@
diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 9cd96d71b7..b0b9bc7610 100644
--- 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
diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in
index fe2b022952..8e0e3cb619 100644
--- 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
diff --git a/lib/isc/x86_32/include/isc/Makefile.in b/lib/isc/x86_32/include/isc/Makefile.in
index 4927e210f3..1dd56da4eb 100644
--- 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
diff --git a/lib/isc/x86_64/include/isc/Makefile.in b/lib/isc/x86_64/include/isc/Makefile.in
index 9a988bb761..6400bad6fe 100644
--- 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
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 843e510a6f..b9561fbf7e 100644
--- 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@
diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index c4af19a749..18d9794bb5 100644
--- 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
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 6ad279b3f2..54b75fe08c 100644
--- 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@
diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in
index d6f395ca72..83c019e6a2 100644
--- 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
diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index dd8eb65eed..acee2c4297 100644
--- 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@
diff --git a/lib/lwres/man/Makefile.in b/lib/lwres/man/Makefile.in
index 80db9f2ff5..5194aca344 100644
--- 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@
diff --git a/lib/lwres/tests/Makefile.in b/lib/lwres/tests/Makefile.in
index e80ad3f69a..704fe763f7 100644
--- 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@
diff --git a/lib/samples/Makefile.in b/lib/samples/Makefile.in
index 41a54e1953..a44c8540b8 100644
--- 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@
diff --git a/lib/tests/include/tests/Makefile.in b/lib/tests/include/tests/Makefile.in
index cfadac7865..2dedea5277 100644
--- 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 =