[Bug 683] fix version number string mismatches

bk: 44db9cc0VKB0CDAs0xeWsvjq-1x2Gg

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index b1b5e46fa02d681d78d0244ae93ac67ebf4ce252..4321191e3a6d454bb1fdffb77d55b50826e33d40 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -32,6 +32,9 @@ ETAGS_ARGS = Makefile.am
 check_PROGRAMS = @MAKE_CHECK_Y2K@
 EXTRA_PROGRAMS = check_y2k ntpdsim
 run_ag = cd $(srcdir) && autogen -L ../include
+std_def_list=  $(top_srcdir)/include/debug-opt.def     \
+               $(top_srcdir)/include/copyright.def     \
+               $(top_srcdir)/include/version.def
 
 check-local: @MAKE_CHECK_Y2K@
        test -z "@MAKE_CHECK_Y2K@" || ./@MAKE_CHECK_Y2K@
@@ -61,23 +64,23 @@ libntpd_a_SOURCES = jupiter.h ntp_control.c \
        refclock_zyfer.c
 
 $(srcdir)/ntpd-opts.h: ntpd-opts.c
-$(srcdir)/ntpd-opts.c: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpd-opts.c: ntpd-opts.def ntpdbase-opts.def $(std_def_list)
        $(run_ag) ntpd-opts.def
 
-$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpd.1: ntpd-opts.def ntpdbase-opts.def $(std_def_list)
        $(run_ag) -Tagman1.tpl -bntpd ntpd-opts.def
 
-$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu: ntpd-opts.def ntpdbase-opts.def $(std_def_list)
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpd-opts.def
 
 $(srcdir)/ntpdsim-opts.h: ntpdsim-opts.c
-$(srcdir)/ntpdsim-opts.c: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpdsim-opts.c: ntpdsim-opts.def ntpdbase-opts.def $(std_def_list)
        $(run_ag) ntpdsim-opts.def
 
-$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpdsim.1: ntpdsim-opts.def ntpdbase-opts.def $(std_def_list)
        $(run_ag) -Tagman1.tpl -bntpdsim ntpdsim-opts.def
 
-$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def ntpdbase-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpdsim-opts.texi $(srcdir)/ntpdsim-opts.menu: ntpdsim-opts.def ntpdbase-opts.def $(std_def_list)
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpdsim-opts.def
 
 $(PROGRAMS): $(LDADD)

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 4d44e839f4a6eb9c3b7beb7210f898e62a28c148..9c7c532541335c7d3757ab2cf80ffc69fb4e72cc 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -20,15 +20,18 @@ BUILT_SOURCES+=     ntpdc-opts.c ntpdc-opts.h ntpdc.1 ntpdc-opts.texi       \
                ntpdc-opts.menu
 man_MANS=      ntpdc.1
 run_ag=         cd $(srcdir) && autogen -L ../include
+std_def_list=  $(top_srcdir)/include/debug-opt.def     \
+               $(top_srcdir)/include/copyright.def     \
+               $(top_srcdir)/include/version.def
 
 $(srcdir)/ntpdc-opts.h: ntpdc-opts.c
-$(srcdir)/ntpdc-opts.c: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpdc-opts.c: ntpdc-opts.def $(std_def_list)
        $(run_ag) ntpdc-opts.def
 
-$(srcdir)/ntpdc.1: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpdc.1: ntpdc-opts.def $(std_def_list)
        $(run_ag) -Tagman1.tpl -bntpdc ntpdc-opts.def
 
-$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpdc-opts.texi $(srcdir)/ntpdc-opts.menu: ntpdc-opts.def $(std_def_list)
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpdc-opts.def
 
 ntpdc_SOURCES = ntpdc.c ntpdc_ops.c ntpdc-opts.c ntpdc-opts.h

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 24eb0d787a8eb8a5a1f967369b1a580cf04d4f40..d3f2116143b7ed357747c47cfdfdf5ea6ba9383c 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -12,16 +12,19 @@ EXTRA_DIST= ntpq-opts.def ntpq.1 ntpq-opts.texi ntpq-opts.menu
 BUILT_SOURCES= ntpq-opts.c ntpq-opts.h ntpq.1 ntpq-opts.texi ntpq-opts.menu
 man_MANS=      ntpq.1
 run_ag=         cd $(srcdir) && autogen -L ../include
+std_def_list=  $(top_srcdir)/include/debug-opt.def     \
+               $(top_srcdir)/include/copyright.def     \
+               $(top_srcdir)/include/version.def
 ntpq_SOURCES=  ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h
 
 $(srcdir)/ntpq-opts.h: ntpq-opts.c
-$(srcdir)/ntpq-opts.c: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpq-opts.c: ntpq-opts.def $(std_def_list)
        $(run_ag) ntpq-opts.def
 
-$(srcdir)/ntpq.1: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpq.1: ntpq-opts.def $(std_def_list)
        $(run_ag) -Tagman1.tpl -bntpq ntpq-opts.def
 
-$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu: ntpq-opts.def $(std_def_list)
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpq-opts.def
 
 $(PROGRAMS): $(LDADD)

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 9d5db30bad5459e9b97c96c2089098d9ca98c341..234e8e138c6547dc59a50d90235dfbd3bf1ff068 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -36,18 +36,29 @@ sntp_SOURCES = \
 dist_man_MANS= sntp.1
 
 EXTRA_DIST=    bincheck.mf     \
-               sntp-opts.def sntp.1 sntp-opts.texi sntp-opts.menu
+               COPYRIGHT       \
+               sntp-opts.def sntp.1 sntp-opts.texi sntp-opts.menu version.def
 BUILT_SOURCES= sntp-opts.c sntp-opts.h sntp.1 sntp-opts.texi sntp-opts.menu
 man_MANS=      sntp.1
 
+
+FRC:
+$(srcdir)/version.def: FRC
+       cd $(srcdir)                                    \
+       && test -e ../include/version.def               \
+       && ( if cmp -s ../include/version.def version.def;      \
+          then : ;                                             \
+          else cp ../include/version.def version.def;          \
+          fi )
+
 $(srcdir)/sntp-opts.h: sntp-opts.c
-$(srcdir)/sntp-opts.c: sntp-opts.def
+$(srcdir)/sntp-opts.c: sntp-opts.def $(srcdir)/version.def
        $(run_ag) sntp-opts.def
 
-$(srcdir)/sntp.1: sntp-opts.def
+$(srcdir)/sntp.1: sntp-opts.def $(srcdir)/version.def
        $(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
 
-$(srcdir)/sntp-opts.texi $(srcdir)/sntp-opts.menu: sntp-opts.def
+$(srcdir)/sntp-opts.texi $(srcdir)/sntp-opts.menu: sntp-opts.def $(srcdir)/version.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
 
 include bincheck.mf

diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def
index 3f4fe9ba666b0cae78d2447ae70d50fa6a5d8a21..f873dab626ea6ad0bad214a959b72ec11e4544ab 100644 (file)
--- a/sntp/sntp-opts.def
+++ b/sntp/sntp-opts.def
@@ -7,7 +7,7 @@ copyright = {
     owner = "ntp.org";
     eaddr = "http://bugs.ntp.isc.org, bugs@ntp.org";
     type  = note;
-    text  = 'See the sntp/Copyright file';
+    text  = `cat Copyright`;
 };
 
 
@@ -26,10 +26,7 @@ rcfile         = "ntp.ini";
 
 environrc;
 
-version         = `
-eval VERSION=\`sed -e 's/.*,\\[//' -e 's/\\].*//' < ../version.m4\`
-[ -z "${VERSION}" ] && echo "Cannot determine VERSION" && kill -TERM $AG_pid
-echo $VERSION`;
+#include version.def;
 
 test-main;
 

diff --git a/util/Makefile.am b/util/Makefile.am
index 7610c2d730c990ffc7bfce48da2ef45f1d9ce23c..79719f7dbb8abe47d8945aa531c8b3c0d3529248 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -19,15 +19,18 @@ BUILT_SOURCES=      ntp-keygen-opts.c ntp-keygen-opts.h ntp-keygen.1        \
                ntp-keygen-opts.texi ntp-keygen-opts.menu
 man_MANS=      ntp-keygen.1
 run_ag=         cd $(srcdir) && autogen -L ../include
+std_def_list=  $(top_srcdir)/include/debug-opt.def     \
+               $(top_srcdir)/include/copyright.def     \
+               $(top_srcdir)/include/version.def
 
 $(srcdir)/ntp-keygen-opts.h: ntp-keygen-opts.c
-$(srcdir)/ntp-keygen-opts.c: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntp-keygen-opts.c: ntp-keygen-opts.def $(std_def_list)
        $(run_ag) ntp-keygen-opts.def
 
-$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntp-keygen.1: ntp-keygen-opts.def $(std_def_list)
        $(run_ag) -Tagman1.tpl -bntp-keygen ntp-keygen-opts.def
 
-$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu: ntp-keygen-opts.def $(top_srcdir)/include/debug-opt.def $(top_srcdir)/include/copyright.def
+$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu: ntp-keygen-opts.def $(std_def_list)
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntp-keygen-opts.def