From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 28 Jan 2014 11:51:39 +0000 (-0800)
Subject: Fix the man page installation for the scripts/ files
X-Git-Tag: NTP_4_2_7P415~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8452bde5485ed30768ba9c87ef90bcb1755cf49c;p=thirdparty%2Fntp.git

Fix the man page installation for the scripts/ files

bk: 52e799cblCxNd6OJZyAro6WRoLztUw
---

diff --git a/ChangeLog b/ChangeLog
index d6458db1e..a9bd87e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix the man page installation for the scripts/ files.
 (4.2.7p414) 2014/01/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 792] TrueTime TL-3 WWV refclock support.
 * [Bug 898] Documentation fixes.
diff --git a/scripts/calc_tickadj/Makefile.am b/scripts/calc_tickadj/Makefile.am
index f14842ac4..f94908bb1 100644
--- a/scripts/calc_tickadj/Makefile.am
+++ b/scripts/calc_tickadj/Makefile.am
@@ -8,6 +8,8 @@ libexec_SCRIPTS=	$(CALC_TICKADJ_DL)
 sbin_SCRIPTS=	$(CALC_TICKADJ_DS)
 EXTRA_SCRIPTS=	calc_tickadj
 
+man1_MANS=
+man8_MANS=
 manpage_HACK=
 if WANT_CALC_TICKADJ_MS
 man_MANS=	calc_tickadj.$(CALC_TICKADJ_MS)
diff --git a/scripts/ntp-wait/Makefile.am b/scripts/ntp-wait/Makefile.am
index 3bc35a640..07920b0d2 100644
--- a/scripts/ntp-wait/Makefile.am
+++ b/scripts/ntp-wait/Makefile.am
@@ -4,6 +4,8 @@ bin_SCRIPTS =	$(NTP_WAIT_DB)
 libexec_SCRIPTS =	$(NTP_WAIT_DL)
 sbin_SCRIPTS =	$(NTP_WAIT_DS)
 
+man1_MANS=
+man8_MANS=
 man_MANS=	ntp-wait.$(NTP_WAIT_MS)
 
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_srcdir)/scripts/lib"	\
diff --git a/scripts/ntpsweep/Makefile.am b/scripts/ntpsweep/Makefile.am
index 2a5bb1a62..874100989 100644
--- a/scripts/ntpsweep/Makefile.am
+++ b/scripts/ntpsweep/Makefile.am
@@ -17,6 +17,8 @@ libexec_SCRIPTS=	$(NTPSWEEP_DL)
 noinst_SCRIPTS=		$(NTPSWEEP_NI)
 EXTRA_SCRIPTS=		ntpsweep
 
+man1_MANS=
+man8_MANS=
 if INSTALL_NTPSWEEP
 man_MANS=	ntpsweep.$(NTPSWEEP_MS)
 else
diff --git a/scripts/ntptrace/Makefile.am b/scripts/ntptrace/Makefile.am
index 7dab423fe..6a46768b2 100644
--- a/scripts/ntptrace/Makefile.am
+++ b/scripts/ntptrace/Makefile.am
@@ -1,4 +1,6 @@
 NULL=
+man1_MANS=
+man8_MANS=
 man_MANS=	ntptrace.$(NTPTRACE_MS)
 
 bin_SCRIPTS =	$(NTPTRACE_DB)
diff --git a/sntp/loc/README b/sntp/loc/README
index 07c746d6e..58f216956 100644
--- a/sntp/loc/README
+++ b/sntp/loc/README
@@ -8,3 +8,10 @@ redhat* or fedora*, we will look for loc/redhat .
 
 If no "mode specific" file has been found and the "uname" command returns
 "Linux", we will look for loc/linux .
+
+Note that automake has interesting behavior - we build the man pages using
+the man_MANS target, but they are actually installed using the empty
+manX_MANS= target, which "does the right thing".  This means that we
+need to have empty manX_MANS= targets for each possible X, based on
+the data in the loc/ files.  For executables, this generally means
+sections 1 and 8.