From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 19 Dec 2013 09:27:41 +0000 (+0000)
Subject: cleanup
X-Git-Tag: NTP_4_2_7P402~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=976337f7ea271d8c99677139d6ab930b2138b908;p=thirdparty%2Fntp.git

cleanup

bk: 52b2bc0du41gJO-lq6c2mU4P28Q45A
---

diff --git a/scripts/calc_tickadj/Makefile.am b/scripts/calc_tickadj/Makefile.am
index e5cf75060..c0b019ee6 100644
--- a/scripts/calc_tickadj/Makefile.am
+++ b/scripts/calc_tickadj/Makefile.am
@@ -1,3 +1,4 @@
+NULL=
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
 		--writable
@@ -7,28 +8,32 @@ libexec_SCRIPTS=	$(CALC_TICKADJ_DL)
 sbin_SCRIPTS=	$(CALC_TICKADJ_DS)
 EXTRA_SCRIPTS=	calc_tickadj
 
-EXTRA_DIST = 	\
-	$(srcdir)/calc_tickadj.in \
-	$(srcdir)/calc_tickadj.1calc_tickadjman	\
-	$(srcdir)/calc_tickadj.1calc_tickadjmdoc	\
-	$(srcdir)/calc_tickadj.texi	\
-	$(srcdir)/calc_tickadj.html	\
-	$(srcdir)/calc_tickadj-opts.def	\
-	$(srcdir)/calc_tickadj-opts	\
-	$(srcdir)/invoke-calc_tickadj.texi	\
-	$(srcdir)/invoke-calc_tickadj.menu
-
-noinst_DATA = \
-	$(srcdir)/calc_tickadj.in \
-	$(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
+# HMS: we only want the following if we're installing calc_tickadj
+man_MANS=	calc_tickadj.$(CALC_TICKADJ_MS)
+
+EXTRA_DIST =				\
+	calc_tickadj.in 		\
+	calc_tickadj.1calc_tickadjman	\
+	calc_tickadj.1calc_tickadjmdoc	\
+	calc_tickadj.texi		\
+	calc_tickadj.html		\
+	calc_tickadj-opts.def		\
+	calc_tickadj-opts		\
+	invoke-calc_tickadj.texi	\
+	invoke-calc_tickadj.menu	\
+	$(NULL)
+
+noinst_DATA = 				\
+	calc_tickadj.in 		\
+	calc_tickadj.1calc_tickadjman	\
+	calc_tickadj.1calc_tickadjmdoc	\
+	calc_tickadj.texi		\
+	calc_tickadj.html		\
+	calc_tickadj-opts.def		\
+	calc_tickadj-opts		\
+	invoke-calc_tickadj.texi	\
+	invoke-calc_tickadj.menu	\
+	$(NULL)
 
 calc_tickadj: $(srcdir)/calc_tickadj-opts