calc_tickadj man page generation fixes

bk: 52b2dce2lYUkMNk8xMHce6ayZG59dw

diff --git a/scripts/calc_tickadj/Makefile.am b/scripts/calc_tickadj/Makefile.am
index c0b019ee64869839f1c0d0ece2e9fc7200930439..3c3b275a4dee54bd0ffe7185167fa81efd521b91 100644 (file)
--- a/scripts/calc_tickadj/Makefile.am
+++ b/scripts/calc_tickadj/Makefile.am
@@ -8,8 +8,9 @@ libexec_SCRIPTS=        $(CALC_TICKADJ_DL)
 sbin_SCRIPTS=  $(CALC_TICKADJ_DS)
 EXTRA_SCRIPTS= calc_tickadj
 
-# HMS: we only want the following if we're installing calc_tickadj
+if WANT_CALC_TICKADJ_MS
 man_MANS=      calc_tickadj.$(CALC_TICKADJ_MS)
+endif
 
 EXTRA_DIST =                           \
        calc_tickadj.in                 \

diff --git a/sntp/m4/ntp_locinfo.m4 b/sntp/m4/ntp_locinfo.m4
index 3efd2ce941321c7c7e432e7526aefccc6bffcee4..3e41b5bb0078c5fbc2248260fcc277e263af7596 100644 (file)
--- a/sntp/m4/ntp_locinfo.m4
+++ b/sntp/m4/ntp_locinfo.m4
@@ -44,6 +44,8 @@ case "$GENLOCINFO" in
     ;;
 esac
 
+AM_CONDITIONAL([WANT_CALC_TICKADJ_MS], [test "$CALC_TICKADJ_MS" ])
+
 AC_SUBST([CALC_TICKADJ_DB])
 AC_SUBST([CALC_TICKADJ_DL])
 AC_SUBST([CALC_TICKADJ_DS])