Fix the man page installation for the scripts/ files

bk: 52e799cblCxNd6OJZyAro6WRoLztUw

diff --git a/ChangeLog b/ChangeLog
index d6458db1ef8dfc7b22af5ffa6961a8dc803891b9..a9bd87e7fe8ccff07d8c383d87e2d1b192a64f60 100644 (file)
--- 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 f14842ac4fa831a40f57ad880776b2422de11431..f94908bb15c382d651b904c219780fb971b65b7e 100644 (file)
--- 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 3bc35a640ceaf1db0136d83ee23cdf985c7a6c8e..07920b0d2ea0ba90377100bfbc1176e5fad52770 100644 (file)
--- 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 2a5bb1a626edd7280bccef6b722803bcd7ea2b7f..874100989d804324b23eecacb72c7ec0bc33ae8c 100644 (file)
--- 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 7dab423fe553a0eff9ebdf7c298bc0a3ee6bca97..6a46768b22a2adb44793758e083483997e80abe6 100644 (file)
--- 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 07c746d6e08c8948d9c96606aeb14fb98116da1f..58f216956530b265e2cbe8b5c9b8f07aac8ac63a 100644 (file)
--- 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.