From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 19 Dec 2013 11:47:46 +0000 (+0000)
Subject: calc_tickadj man page generation fixes
X-Git-Tag: NTP_4_2_7P402~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e21031549c13d3c5938bfbb5f378ebd842eaf2;p=thirdparty%2Fntp.git

calc_tickadj man page generation fixes

bk: 52b2dce2lYUkMNk8xMHce6ayZG59dw
---

diff --git a/scripts/calc_tickadj/Makefile.am b/scripts/calc_tickadj/Makefile.am
index c0b019ee6..3c3b275a4 100644
--- 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 3efd2ce94..3e41b5bb0 100644
--- 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])