[master] fix python script versions

4257.	[cleanup]	Python scripts reported incorrect version. [RT #41080]

diff --git a/CHANGES b/CHANGES
index c8c4fb451362b83558407b586cb644ba589e1a01..7c02d40f4c76af0891251060230d6ebf1f0a5dc2 100644 (file)
--- 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 e6d2699df05278ecfe356797a480cadee9ff30f8..b5a0b2ad62b01e7ffa60e3b790edb3efeac5c86d 100644 (file)
--- 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 b88be3cb85bf4b5c7be840bbff3d199092d8dd4c..5db667186d9680ec8d9ed27b32278297062d5563 100644 (file)
--- 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 409dffd1c6ecca1d6441e8e8c90e49dbc3a50c50..176ce54af78d888866376cf6016e8974cf70b76f 100644 (file)
--- 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 7569bd7fe46d28309e0cb0b6f49acf86d097fa26..5a59cf5392dc9ee5f690b853cb0fe596b68bc999 100644 (file)
--- 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 730f1b57efa93f01fa043e4127af78cb59eb8226..b5f23449315bea72ebf004d0b644f00622599e0d 100644 (file)
--- 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 4f1bf9095d91ecaea04babdb14ca73f4dca7c3fe..4409100fbee216f31f39fde81b84013d22ca22e3 100644 (file)
--- 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 899756a1defa743511438f409d386c266bc18ee7..05810bcac82e00ae361ce08cace47a4a8dec9376 100644 (file)
--- 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 5dc20ad90714dcb6eca72ae83261586a16eb4162..4ac3331ca0dbcb4f319d58befac8d1d76d4485a7 100644 (file)
--- 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 3a66ee24b4a6c09a1c758044ef5d8b107a77755a..d821c097ce0dbea380aa125aa426a76e38c076d2 100644 (file)
--- 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 39ec549ec9d74bad688f1fb17c4289f338bdb2b1..ccd01a9cc13798df42b674a26baef31c33b3aef9 100755 (executable)
--- 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 8d7f38dcd6da9be20c0073e50639065d9c810b05..8c57d892e6892555390b6572b62db8c3069d6f37 100644 (file)
--- 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 135c1f9cb48d1e7d22109f44be07b5a854ee6ce9..2fb4dcd398e6b62dbf3bb4408274ce7e3cc3f406 100644 (file)
--- 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 e2225704ceb726a2a71f47ea07ef2c9430fdab75..5c15df1a2426ddcfa7ee43cfc772a8581d009f91 100644 (file)
--- 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 c7792f21331aba1e8e8157f8f2e0291107f68176..f27231309eb4afc68a4ede1c9511016c9db136d9 100644 (file)
--- 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 3a03de5aaa799ce522961f52bb42d846026a8165..8aa47fde1545171389fdb17b3bf33c4fb5a69d66 100644 (file)
--- 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 1cf9d4ab80f8e124c0f95705f15d20418b44751f..1b481af091cb7b9e46268f27b2a5cc77b009331e 100644 (file)
--- 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 9623ff91a5ca1c04ac2dc6d7d6513f4f741f9f00..65ba897d923c9801a18d1ee495557b7bbeff3398 100644 (file)
--- 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 9d87982dcfb72d7fa1943ce37d83b93eae4d2711..6876ea1f5d604e42fb4a66b18e51b8dfd458fb35 100644 (file)
--- 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 995ec2cfe9412ea3c553f5799a0300ae1e7d5e6d..4d8a4583b31e40315baac7169c1ecf1bcc6f92ec 100644 (file)
--- 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 01df4e6c9a00434c18f20fb3e4877ccaf46d6dac..2e7e6795faa1e276e734f57eb8f8c9995e4d3cdf 100644 (file)
--- 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 4042217def1de107bc2e9dcea1b45ceda4c74f32..dec82e82166a7e178b9d51512e3d2ac850354deb 100644 (file)
--- 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 0f7f711ebc34ab33e786c7b56e951fa9668f3802..5f1fccbc0a669ef6ee07bd3ef489aac27ae545eb 100644 (file)
--- 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 c1823ad90476f432bc5b8bd530c51b3fb7350f72..4c7d49dea51a1bad03edf772fe87381051fdb589 100644 (file)
--- 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 b2f40d799998ad34c1539cc82830a513fb7a04f7..419052ba73f32cedd107e1ab3031d846d5bcc3b9 100644 (file)
--- 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 b5124ab101f03aa62f983425ddafe51193d2eebe..2aab42a8b33df1df73bc5ca6081dab12a307027e 100644 (file)
--- 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 dfc2951b029c5ec97b7463f281ab50f96266c273..831c96aac9822cc51717d72fd4a2dd74b06bdf69 100644 (file)
--- 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 864645b6bde9d2f78e652cf0d687c4d08311a2a8..a683b8d1a0f65272cc699ce80c01f0be11bd16be 100755 (executable)
--- 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 cf06cd9ad0136602634c771753fde1033aa6a34e..eaf9411ceea05fe73bbab58d5b6531c5d16eb4a1 100644 (file)
--- 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 8a4f8c4c7997169e198d6e860be5bc698fb348df..e9dd88aed7731749dd2a25ec741c9c15d28b4845 100644 (file)
--- 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 4b2aa7282212393bd183f29fb7d42723ba40ffa8..07f1abfc3188dc9c334e91093f8d737c7f14a796 100644 (file)
--- 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>'

diff --git a/doc/arm/noteversion.xml.in b/doc/arm/noteversion.xml.in
new file mode 100644 (file)
index 0000000..d6bc8de
--- /dev/null
+++ b/doc/arm/noteversion.xml.in
@@ -0,0 +1 @@
+<title>Release Notes for BIND Version @BIND9_VERSION@</title>

diff --git a/doc/arm/pkgversion.xml.in b/doc/arm/pkgversion.xml.in
new file mode 100644 (file)
index 0000000..c0e32dc
--- /dev/null
+++ b/doc/arm/pkgversion.xml.in
@@ -0,0 +1 @@
+      <para>This version of the manual corresponds to BIND version @PACKAGE_VERSION@.</para>

diff --git a/doc/arm/releaseinfo.xml.in b/doc/arm/releaseinfo.xml.in
new file mode 100644 (file)
index 0000000..facf35e
--- /dev/null
+++ b/doc/arm/releaseinfo.xml.in
@@ -0,0 +1 @@
+<releaseinfo>BIND Version @BIND9_VERSION@</releaseinfo>

diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index ec623986ab8fe2ba6134c21e7d347df57966bde5..c336635061979e5955b017f7bb58280e1b87aab1 100644 (file)
--- 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 04a9e5c6f4ffe70ba32674deebcb0d44a34d2b2c..056c4875a1d2b7552a5de6b19f5c4a00d2d4850d 100644 (file)
--- 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 e9e65daa96613b5ff7c69160d77d5264535ea89c..648fc7b1a8ac8166b0b1563510cc5806a9a7dab1 100644 (file)
--- 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 11ae586205efb7a6b830e614243255c9eab4f2f6..d531f97a61cdfd2d515ec23a8ff15f9259e36a05 100644 (file)
--- 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 3d3658f3038727a76c577594d2a733f47fdc6b71..ee40594ed800f3edd7bd9c27ab81fd9dadcdc074 100644 (file)
--- 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 3e9536e53fa97e81c3dacf8f5b1f3fdc32e34962..f06f338810f3ce331fa080986f5b5c36d290369f 100644 (file)
--- 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 cece67dd33a0d1f78353ea1fe2e6c0c3188cffec..628c160e708a05d18821dec23c020b65edae50fb 100644 (file)
--- 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 2416c065f27169554c1f9f1de3fe972151bb74ec..427b14677c426ed9e55a9c8e15110a3c0836ea89 100644 (file)
--- 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 ba802bf478331494c6875632f076a4a45a05bd69..cbba88dd33fe692a56e5b1f0f9a9846340879a5a 100644 (file)
--- 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 1a58783d3127b0d81075d59a120742e2d965ca30..d3a5de82992f6009246df8eff40bc9d08c6dae34 100644 (file)
--- 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 4927e210f38eb8a50663053d9c1ec8d6a06e769d..1dd56da4eb0f3992cc750fa9adcdb54cc2844034 100644 (file)
--- 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 4927e210f38eb8a50663053d9c1ec8d6a06e769d..1dd56da4eb0f3992cc750fa9adcdb54cc2844034 100644 (file)
--- 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 0a0b0773ae3ec22390a8c779214825dd2ff1b76f..e27a69117e01a014539e6025a249c3bd87e38421 100644 (file)
--- 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 744c40e9038ab17e32f8b422c455e8aec8dd5621..e29713115f75e25bcded33d00df4fc5eec3a1c49 100644 (file)
--- 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 6e986886d359ad748001e8747d9aa3f264040f6d..c5ec7a496802986c001268dbc26a6507708bc3dc 100644 (file)
--- 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 4927e210f38eb8a50663053d9c1ec8d6a06e769d..1dd56da4eb0f3992cc750fa9adcdb54cc2844034 100644 (file)
--- 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 4927e210f38eb8a50663053d9c1ec8d6a06e769d..1dd56da4eb0f3992cc750fa9adcdb54cc2844034 100644 (file)
--- 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 a2c347eaa253ad3c663c391540ee589f09cefab5..3180cd5e034a904e7436b9c10fa88b0ade8da84b 100644 (file)
--- 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 4927e210f38eb8a50663053d9c1ec8d6a06e769d..1dd56da4eb0f3992cc750fa9adcdb54cc2844034 100644 (file)
--- 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 7cadcf4b6f3dede7b782539bb1672446d02d38a3..b8c802f4580a74eef391e319d564ffdf57a2ba8b 100644 (file)
--- 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 4927e210f38eb8a50663053d9c1ec8d6a06e769d..1dd56da4eb0f3992cc750fa9adcdb54cc2844034 100644 (file)
--- 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 6735e5d930950655ea36e67d61a73d9d2fc05d7b..b4183665549d07be5c0ce77d3ec4398c4b7a975a 100644 (file)
--- 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 9cd96d71b7504741d37288763ddac11755647c4c..b0b9bc76109b93bf54d6f510554a13f965394d96 100644 (file)
--- 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 fe2b0229520b2ee2c418ce96d58e2346d63b525a..8e0e3cb6193186e722c9ba35ab553d6b7e04182f 100644 (file)
--- 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 4927e210f38eb8a50663053d9c1ec8d6a06e769d..1dd56da4eb0f3992cc750fa9adcdb54cc2844034 100644 (file)
--- 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 9a988bb76159874da02fb6803df4658fe148c293..6400bad6fe97e9d09b8b6c081aa08f79c0d6e4f5 100644 (file)
--- 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 843e510a6f0686db031cfda801b8fdf460c542bb..b9561fbf7efafbc76e73a23f46941f5db66e3167 100644 (file)
--- 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 c4af19a74968255d38385aaf35cea1c34319ee46..18d9794bb546a79f7482cbd2059134ef2227aaf5 100644 (file)
--- 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 6ad279b3f2c221a140795052c6200738ebe360ac..54b75fe08c8b0af385fa8ae1ab2e0bb77fd9e178 100644 (file)
--- 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 d6f395ca72b09ad62eabf90abec4d137cbc8dc22..83c019e6a20c8599ce5a88ecd080bc5e1ddd0855 100644 (file)
--- 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 dd8eb65eed5f5efcf56759e2fc76482be431226b..acee2c4297ad5857376bc0a7b5b1613f37c29d1f 100644 (file)
--- 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 80db9f2ff5dd627743c06ff066160178de48c958..5194aca344fe6452176e3b93cc4b9aef22f7057c 100644 (file)
--- 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 e80ad3f69a8af4069738152142c9ffef257934c6..704fe763f7f3ec486e3f7db9b31c801e87ca3981 100644 (file)
--- 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 41a54e19533c44e20975585227626320560bda1b..a44c8540b8e6e83368c1f99012a983f8a0b96dd2 100644 (file)
--- 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 cfadac7865755bef281f61714feb1b0ee06f49f0..2dedea5277d736340d4b359b502ec0189765c116 100644 (file)
--- 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 =