automake cleanup for Oliver's work

bk: 52b2a69fc94p8youIiMwSI6KW0Af5g

diff --git a/configure.ac b/configure.ac
index 033dd5cdd2567ca13e521ffd09f0b971da85d2ab..8fc3bb08f624460bba86421908020bab5d276a24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3684,6 +3684,10 @@ case "$ntp_cv_make_tickadj" in
     MAKE_TICKADJ=tickadj
     ;;
  *)
+    CALC_TICKADJ_DB=
+    CALC_TICKADJ_DL=
+    CALC_TICKADJ_DS=
+    CALC_TICKADJ_MS=
     TICKADJ_DB=
     TICKADJ_DL=
     TICKADJ_DS=

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3834f0678d1468ab178323f24e1218999b58373e..cf4194276e217216a25b4b7920a09010bbf81af9 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,12 @@
-SUBDIRS = build calc_tickadj ntp-wait ntpsweep ntptrace lib
-
 NULL=
+SUBDIRS=               \
+       build           \
+       calc_tickadj    \
+       ntp-wait        \
+       ntpsweep        \
+       ntptrace        \
+       lib             \
+       $(NULL)
 
 man1_MANS=
 man8_MANS=

diff --git a/scripts/calc_tickadj/Makefile.am b/scripts/calc_tickadj/Makefile.am
index fbdea574183d202b1aa5579c9c6c5cf72099f7e6..e5cf75060510a45036bad85f9bbb4948bdcf222f 100644 (file)
--- a/scripts/calc_tickadj/Makefile.am
+++ b/scripts/calc_tickadj/Makefile.am
@@ -2,21 +2,22 @@ run_ag=               cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
                autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
                --writable
 
+bin_SCRIPTS=   $(CALC_TICKADJ_DB)
+libexec_SCRIPTS=       $(CALC_TICKADJ_DL)
+sbin_SCRIPTS=  $(CALC_TICKADJ_DS)
+EXTRA_SCRIPTS= calc_tickadj
+
 EXTRA_DIST =   \
        $(srcdir)/calc_tickadj.in \
-       $(srcdir)/calc_tickadj  \
        $(srcdir)/calc_tickadj.1calc_tickadjman \
        $(srcdir)/calc_tickadj.1calc_tickadjmdoc        \
        $(srcdir)/calc_tickadj.texi     \
        $(srcdir)/calc_tickadj.html     \
-       $(srcdir)/calc_tickadj.1                \
        $(srcdir)/calc_tickadj-opts.def \
        $(srcdir)/calc_tickadj-opts     \
        $(srcdir)/invoke-calc_tickadj.texi      \
        $(srcdir)/invoke-calc_tickadj.menu
 
-noinst_SCRIPTS = calc_tickadj
-
 noinst_DATA = \
        $(srcdir)/calc_tickadj.in \
        $(srcdir)/calc_tickadj.1calc_tickadjman \
@@ -60,9 +61,9 @@ $(srcdir)/calc_tickadj.mdoc.in: $(srcdir)/calc_tickadj.1calc_tickadjmdoc $(top_s
 
 ### Manpage
 
-$(srcdir)/calc_tickadj.1: $(srcdir)/calc_tickadj.$(MANTAGFMT).in $(top_builddir)/config.status
-       $(top_builddir)/config.status --file=calc_tickadj.1+:$(srcdir)/calc_tickadj.$(MANTAGFMT).in
-       mv calc_tickadj.1+ calc_tickadj.1
+calc_tickadj.$(CALC_TICKADJ_MS): $(srcdir)/calc_tickadj.$(MANTAGFMT).in $(top_builddir)/config.status
+       $(top_builddir)/config.status --file=calc_tickadj.$(CALC_TICKADJ_MS)+:$(srcdir)/calc_tickadj.$(MANTAGFMT).in
+       mv calc_tickadj.$(CALC_TICKADJ_MS)+ calc_tickadj.$(CALC_TICKADJ_MS)
 
 ### Texinfo
 

diff --git a/scripts/calc_tickadj/calc_tickadj.texi b/scripts/calc_tickadj/calc_tickadj.texi
index a12a626c6bfdf526b5cae8d4d739d1c8b5107468..d15b428eca7fe2f527e598913ebc22de2124bac1 100644 (file)
--- a/scripts/calc_tickadj/calc_tickadj.texi
+++ b/scripts/calc_tickadj/calc_tickadj.texi
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename calc_tickadj.info
 @settitle calc_tickadj User's Manual
-@include ../..//sntp/include/version.texi
+@include ../../sntp/include/version.texi
 @paragraphindent 2
 @c %**end of header
 

diff --git a/scripts/calc_tickadj/invoke-calc_tickadj.texi b/scripts/calc_tickadj/invoke-calc_tickadj.texi
index 39c42397c8dd1afdff7b20b1910b5a03c9945e63..99d51bb99a14ee448b246f58337fbbd60ddfe872 100644 (file)
--- a/scripts/calc_tickadj/invoke-calc_tickadj.texi
+++ b/scripts/calc_tickadj/invoke-calc_tickadj.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-calc_tickadj.texi)
 #
-# It has been AutoGen-ed  December 17, 2013 at 09:24:47 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:41 AM by AutoGen 5.18.3pre7
 # From the definitions    calc_tickadj-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore

diff --git a/scripts/ntp-wait/Makefile.am b/scripts/ntp-wait/Makefile.am
index b8f48aefa6ac2d28696319d997201f701f644bdc..07c3c059c44764e2725965eca99ec43acc0e0135 100644 (file)
--- a/scripts/ntp-wait/Makefile.am
+++ b/scripts/ntp-wait/Makefile.am
@@ -1,41 +1,42 @@
-man_MANS=      ntp-wait.$(NTP_WAIT_MS)
+NULL=
 
 bin_SCRIPTS =  $(NTP_WAIT_DB)
 libexec_SCRIPTS =      $(NTP_WAIT_DL)
 sbin_SCRIPTS = $(NTP_WAIT_DS)
 
-run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
+man_MANS=      ntp-wait.$(NTP_WAIT_MS)
+
+run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_srcdir)/scripts/lib"     \
                autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
                --writable
 
 EXTRA_SCRIPTS = ntp-wait
 
-EXTRA_DIST =   \
-       $(srcdir)/ntp-wait.in \
-       $(srcdir)/ntp-wait      \
-       $(srcdir)/ntp-wait.1ntp-waitman \
+EXTRA_DIST =                                   \
+       $(srcdir)/ntp-wait.in                   \
+       $(srcdir)/ntp-wait.1ntp-waitman         \
        $(srcdir)/ntp-wait.1ntp-waitmdoc        \
-       $(srcdir)/ntp-wait.texi \
-       $(srcdir)/ntp-wait.html \
-       $(srcdir)/ntp-wait.1            \
-       $(srcdir)/ntp-wait-opts.def     \
-       $(srcdir)/ntp-wait-opts \
-       $(srcdir)/invoke-ntp-wait.texi  \
-       $(srcdir)/invoke-ntp-wait.menu
+       $(srcdir)/ntp-wait.texi                 \
+       $(srcdir)/ntp-wait.html                 \
+       $(srcdir)/ntp-wait-opts.def             \
+       $(srcdir)/ntp-wait-opts                 \
+       $(srcdir)/invoke-ntp-wait.texi          \
+       $(srcdir)/invoke-ntp-wait.menu          \
+       $(NULL)
 
 html_DATA = $(srcdir)/ntp-wait.html
 
-noinst_DATA = \
-       $(srcdir)/ntp-wait.in \
-       $(srcdir)/ntp-wait.1ntp-waitman \
+noinst_DATA =                                  \
+       $(srcdir)/ntp-wait.in                   \
+       $(srcdir)/ntp-wait.1ntp-waitman         \
        $(srcdir)/ntp-wait.1ntp-waitmdoc        \
-       $(srcdir)/ntp-wait.texi \
-       $(srcdir)/ntp-wait.html \
-       $(srcdir)/ntp-wait.1            \
-       $(srcdir)/ntp-wait-opts.def     \
-       $(srcdir)/ntp-wait-opts \
-       $(srcdir)/invoke-ntp-wait.texi  \
-       $(srcdir)/invoke-ntp-wait.menu
+       $(srcdir)/ntp-wait.texi                 \
+       $(srcdir)/ntp-wait.html                 \
+       $(srcdir)/ntp-wait-opts.def             \
+       $(srcdir)/ntp-wait-opts                 \
+       $(srcdir)/invoke-ntp-wait.texi          \
+       $(srcdir)/invoke-ntp-wait.menu          \
+       $(NULL)
 
 ntp-wait: $(srcdir)/ntp-wait-opts
 
@@ -68,9 +69,9 @@ $(srcdir)/ntp-wait.mdoc.in: $(srcdir)/ntp-wait.1ntp-waitmdoc $(top_srcdir)/sntp/
 
 ### Manpage
 
-$(srcdir)/ntp-wait.1: $(srcdir)/ntp-wait.$(MANTAGFMT).in $(top_builddir)/config.status
-       $(top_builddir)/config.status --file=ntp-wait.1+:$(srcdir)/ntp-wait.$(MANTAGFMT).in
-       mv ntp-wait.1+ ntp-wait.1
+ntp-wait.$(NTP_WAIT_MS): $(srcdir)/ntp-wait.$(MANTAGFMT).in $(top_builddir)/config.status
+       $(top_builddir)/config.status --file=ntp-wait.$(NTP_WAIT_MS)+:$(srcdir)/ntp-wait.$(MANTAGFMT).in
+       mv ntp-wait.$(NTP_WAIT_MS)+ ntp-wait.$(NTP_WAIT_MS)
 
 ### Texinfo
 

diff --git a/scripts/ntp-wait/invoke-ntp-wait.texi b/scripts/ntp-wait/invoke-ntp-wait.texi
index 0ea4ac5e1175f1ad0bd2ef7041d9c6f1825c0fda..f5c8f42b32811d348fd7934d851d4883f9302795 100644 (file)
--- a/scripts/ntp-wait/invoke-ntp-wait.texi
+++ b/scripts/ntp-wait/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 #
-# It has been AutoGen-ed  December 18, 2013 at 10:49:43 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:46 AM by AutoGen 5.18.3pre7
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore

diff --git a/scripts/ntp-wait/ntp-wait.in b/scripts/ntp-wait/ntp-wait.in
index a7a40acb998f182ee3b6fbaa04a0555f46fcd126..b35828a165827356e1fa0e5c76375cd992727e21 100644 (file)
--- a/scripts/ntp-wait/ntp-wait.in
+++ b/scripts/ntp-wait/ntp-wait.in
@@ -5,7 +5,6 @@ use 5.006_000;
 use strict;
 use warnings;
 use lib "@PERLLIBDIR@";
-use lib "@abs_top_srcdir@/scripts/lib";
 use NTP::Util qw(ntp_read_vars);
 
 exit run(@ARGV) unless caller;

diff --git a/scripts/ntpsweep/Makefile.am b/scripts/ntpsweep/Makefile.am
index caaa3276df1d1594c6235383de156be892e03509..32837e26176b668ef5d30acf8f1fde270f95e17a 100644 (file)
--- a/scripts/ntpsweep/Makefile.am
+++ b/scripts/ntpsweep/Makefile.am
@@ -1,34 +1,35 @@
-run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
+NULL=
+run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_srcdir)/scripts/lib"     \
                autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
                --writable
 
 noinst_SCRIPTS = ntpsweep
 
-EXTRA_DIST =   \
-       $(srcdir)/ntpsweep.in \
-       $(srcdir)/ntpsweep.1ntpsweepman \
+EXTRA_DIST =                                   \
+       $(srcdir)/ntpsweep.in                   \
+       $(srcdir)/ntpsweep.1ntpsweepman         \
        $(srcdir)/ntpsweep.1ntpsweepmdoc        \
-       $(srcdir)/ntpsweep.texi \
-       $(srcdir)/ntpsweep.html \
-       $(srcdir)/ntpsweep.1            \
-       $(srcdir)/ntpsweep-opts.def     \
-       $(srcdir)/ntpsweep-opts \
-       $(srcdir)/invoke-ntpsweep.texi  \
-       $(srcdir)/invoke-ntpsweep.menu
+       $(srcdir)/ntpsweep.texi                 \
+       $(srcdir)/ntpsweep.html                 \
+       $(srcdir)/ntpsweep-opts.def             \
+       $(srcdir)/ntpsweep-opts                 \
+       $(srcdir)/invoke-ntpsweep.texi          \
+       $(srcdir)/invoke-ntpsweep.menu          \
+       $(NULL)
 
 html_DATA = $(srcdir)/ntpsweep.html
 
-noinst_DATA = \
-       $(srcdir)/ntpsweep.in \
-       $(srcdir)/ntpsweep.1ntpsweepman \
+noinst_DATA =                                  \
+       $(srcdir)/ntpsweep.in                   \
+       $(srcdir)/ntpsweep.1ntpsweepman         \
        $(srcdir)/ntpsweep.1ntpsweepmdoc        \
-       $(srcdir)/ntpsweep.texi \
-       $(srcdir)/ntpsweep.html \
-       $(srcdir)/ntpsweep.1            \
-       $(srcdir)/ntpsweep-opts.def     \
-       $(srcdir)/ntpsweep-opts \
-       $(srcdir)/invoke-ntpsweep.texi  \
-       $(srcdir)/invoke-ntpsweep.menu
+       $(srcdir)/ntpsweep.texi                 \
+       $(srcdir)/ntpsweep.html                 \
+       $(srcdir)/ntpsweep-opts.def             \
+       $(srcdir)/ntpsweep-opts                 \
+       $(srcdir)/invoke-ntpsweep.texi          \
+       $(srcdir)/invoke-ntpsweep.menu          \
+       $(NULL)
 
 ntpsweep: $(srcdir)/ntpsweep-opts
 
@@ -61,7 +62,7 @@ $(srcdir)/ntpsweep.mdoc.in: $(srcdir)/ntpsweep.1ntpsweepmdoc $(top_srcdir)/sntp/
 
 ### Manpage
 
-$(srcdir)/ntpsweep.1: $(srcdir)/ntpsweep.$(MANTAGFMT).in $(top_builddir)/config.status
+ntpsweep.1: $(srcdir)/ntpsweep.$(MANTAGFMT).in $(top_builddir)/config.status
        $(top_builddir)/config.status --file=ntpsweep.1+:$(srcdir)/ntpsweep.$(MANTAGFMT).in
        mv ntpsweep.1+ ntpsweep.1
 

diff --git a/scripts/ntpsweep/invoke-ntpsweep.texi b/scripts/ntpsweep/invoke-ntpsweep.texi
index a003994165c9690e118e275ccb67f4da05be9ed1..5ccc2af51b62325c05f172c08ad7da770a9e190a 100644 (file)
--- a/scripts/ntpsweep/invoke-ntpsweep.texi
+++ b/scripts/ntpsweep/invoke-ntpsweep.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsweep.texi)
 #
-# It has been AutoGen-ed  December 18, 2013 at 10:51:05 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:51 AM by AutoGen 5.18.3pre7
 # From the definitions    ntpsweep-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore

diff --git a/scripts/ntpsweep/ntpsweep.in b/scripts/ntpsweep/ntpsweep.in
index 4e640b3f28847059e7d1a55f443767dd4fdb732e..fed35d17e1f0824c7c8a2125784d282fb2d42569 100644 (file)
--- a/scripts/ntpsweep/ntpsweep.in
+++ b/scripts/ntpsweep/ntpsweep.in
@@ -22,7 +22,6 @@ package ntpsweep;
 use 5.006_000;
 use strict;
 use lib "@PERLLIBDIR@";
-use lib "@abs_top_srcdir@/scripts/lib";
 use NTP::Util qw(do_dns ntp_read_vars ntp_peers ntp_sntp_line);
 
 (my $program = $0) =~ s%.*/(.+?)(.pl)?$%$1%;

diff --git a/scripts/ntptrace/Makefile.am b/scripts/ntptrace/Makefile.am
index 91cc97ba9b513637cc54f708aad3e51f31889f70..fe484b4558c933c64c824cb3a58213d5d5fd1397 100644 (file)
--- a/scripts/ntptrace/Makefile.am
+++ b/scripts/ntptrace/Makefile.am
@@ -4,7 +4,7 @@ bin_SCRIPTS =   $(NTPTRACE_DB)
 libexec_SCRIPTS =      $(NTPTRACE_DL)
 sbin_SCRIPTS = $(NTPTRACE_DS)
 
-run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
+run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_srcdir)/scripts/lib"     \
                autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
                --writable
 
@@ -16,7 +16,6 @@ EXTRA_DIST =  \
        $(srcdir)/ntptrace.1ntptracemdoc        \
        $(srcdir)/ntptrace.texi \
        $(srcdir)/ntptrace.html \
-       $(srcdir)/ntptrace.1            \
        $(srcdir)/ntptrace-opts.def     \
        $(srcdir)/ntptrace-opts \
        $(srcdir)/invoke-ntptrace.texi  \
@@ -30,7 +29,6 @@ noinst_DATA = \
        $(srcdir)/ntptrace.1ntptracemdoc        \
        $(srcdir)/ntptrace.texi \
        $(srcdir)/ntptrace.html \
-       $(srcdir)/ntptrace.1            \
        $(srcdir)/ntptrace-opts.def     \
        $(srcdir)/ntptrace-opts \
        $(srcdir)/invoke-ntptrace.texi  \
@@ -65,11 +63,11 @@ $(srcdir)/ntptrace.mdoc.in: $(srcdir)/ntptrace.1ntptracemdoc $(top_srcdir)/sntp/
        sed -f $(top_srcdir)/sntp/scripts/mansec2subst.sed $(srcdir)/ntptrace.1ntptracemdoc > $(srcdir)/ntptrace.mdoc.in+
        mv $(srcdir)/ntptrace.mdoc.in+ $(srcdir)/ntptrace.mdoc.in
 
-### Manpage
+### Manpage (local)
 
-$(srcdir)/ntptrace.1: $(srcdir)/ntptrace.$(MANTAGFMT).in $(top_builddir)/config.status
-       $(top_builddir)/config.status --file=ntptrace.1+:$(srcdir)/ntptrace.$(MANTAGFMT).in
-       mv ntptrace.1+ ntptrace.1
+ntptrace.$(NTPTRACE_MS): $(srcdir)/ntptrace.$(MANTAGFMT).in $(top_builddir)/config.status
+       $(top_builddir)/config.status --file=ntptrace.$(NTPTRCE_MS)+:$(srcdir)/ntptrace.$(MANTAGFMT).in
+       mv ntptrace.$(NTPTRCE_MS)+ ntptrace.$(NTPTRCE_MS)
 
 ### Texinfo
 

diff --git a/scripts/ntptrace/invoke-ntptrace.texi b/scripts/ntptrace/invoke-ntptrace.texi
index fa8d24cefc505a523429185b4300642ab3fbdba3..bf523ffcca71ad1ed1d53df8051e18a6961c2d51 100644 (file)
--- a/scripts/ntptrace/invoke-ntptrace.texi
+++ b/scripts/ntptrace/invoke-ntptrace.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntptrace.texi)
 #
-# It has been AutoGen-ed  December 18, 2013 at 10:51:51 AM by AutoGen 5.18.3pre7
+# It has been AutoGen-ed  December 19, 2013 at 07:48:56 AM by AutoGen 5.18.3pre7
 # From the definitions    ntptrace-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore

diff --git a/scripts/ntptrace/ntptrace.in b/scripts/ntptrace/ntptrace.in
index f87572ed9d0be0526968166bd5ba05d0aca5382b..7cc5ce7f7224399ce6b5487a43d5f65e22da3f8d 100755 (executable)
--- a/scripts/ntptrace/ntptrace.in
+++ b/scripts/ntptrace/ntptrace.in
@@ -5,7 +5,6 @@ package ntptrace;
 use 5.006_000;
 use strict;
 use lib "@PERLLIBDIR@";
-use lib "@abs_top_srcdir@/scripts/lib";
 use NTP::Util qw(ntp_read_vars do_dns);
 
 exit run(@ARGV) unless caller;

diff --git a/sntp/loc/debian b/sntp/loc/debian
index c298b5968d3dc55e80cfbe6ef4edd514803bf985..2dbfc43f57c7c26c82289f607db357983aaf251a 100644 (file)
--- a/sntp/loc/debian
+++ b/sntp/loc/debian
@@ -1,5 +1,6 @@
 # Debian installations and man page suffixes
 MDOC
+calc_tickadj,sbin,8
 ntp-keygen,sbin,8
 ntp-wait,sbin,8
 ntpd,sbin,8

diff --git a/sntp/loc/legacy b/sntp/loc/legacy
index 9ca438c9eb07a6a72ed6b96307f8a5abbaf47be9..a5c274bcb20a7ba62f9161e5ae7aa8fdbcc0fbd9 100644 (file)
--- a/sntp/loc/legacy
+++ b/sntp/loc/legacy
@@ -1,5 +1,6 @@
 # Legacy installations and man page suffixes
 MAN
+calc_tickadj,bin,1
 ntp-keygen,bin,1
 ntp-wait,bin,1
 ntpd,bin,1

diff --git a/sntp/loc/redhat b/sntp/loc/redhat
index 5b84f3685fb397983169b624e09a73b944894d76..730379361de156ba0833a716ab4e4267c361dc76 100644 (file)
--- a/sntp/loc/redhat
+++ b/sntp/loc/redhat
@@ -1,5 +1,6 @@
 # RedHat/Fedora installations and man page suffixes
 MAN
+calc_tickadj,sbin,8
 ntp-keygen,sbin,8
 ntp-wait,sbin,8
 ntpd,sbin,8

diff --git a/sntp/loc/solaris b/sntp/loc/solaris
index 33b024092a0140f70414c1fe6b7b0240e2018a19..51bddb7ec321ab45d9d9d71c7382f497dc8d655a 100644 (file)
--- a/sntp/loc/solaris
+++ b/sntp/loc/solaris
@@ -1,5 +1,6 @@
 # Solaris installations and man page suffixes
 MAN
+calc_tickadj,sbin,1m
 ntp-keygen,sbin,1m
 ntp-wait,libexec,1m
 ntpd,libexec,1m

diff --git a/sntp/m4/ntp_locinfo.m4 b/sntp/m4/ntp_locinfo.m4
index 7b8159d309023568d3388a7d9a0a3a4bdb21a016..3efd2ce941321c7c7e432e7526aefccc6bffcee4 100644 (file)
--- a/sntp/m4/ntp_locinfo.m4
+++ b/sntp/m4/ntp_locinfo.m4
@@ -44,6 +44,10 @@ case "$GENLOCINFO" in
     ;;
 esac
 
+AC_SUBST([CALC_TICKADJ_DB])
+AC_SUBST([CALC_TICKADJ_DL])
+AC_SUBST([CALC_TICKADJ_DS])
+AC_SUBST([CALC_TICKADJ_MS])
 AC_SUBST([MANTAGFMT])
 AC_SUBST([NTPDATE_DB])
 AC_SUBST([NTPDATE_DL])