[Bug 2524] Add ntpsweep to sntp/loc/* files

bk: 52bd1550ltuzw4WiLwW38_xf2geTmA

diff --git a/ChangeLog b/ChangeLog
index d17be790ebf5ad84da6b67176ef05b39b8d72d36..3600659e7ff0bd26e1f5d00ea266964d785a0fa2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 2524] Add ntpsweep to sntp/loc/* files.
+* [Bug 2526] Add "noinst" support to the sntp/loc/ framework.
 (4.2.7p404) 2013/12/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 135] AIX5: "Address already in use" for IPv6 wildcard.
 (4.2.7p403) 2013/12/23 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/scripts/ntpsweep/Makefile.am b/scripts/ntpsweep/Makefile.am
index 1a1e7b886779e2532861d5568d0d3cb5b74318d4..aefe9ea2d21f96e2d5731120ba228beaba16e125 100644 (file)
--- a/scripts/ntpsweep/Makefile.am
+++ b/scripts/ntpsweep/Makefile.am
@@ -3,7 +3,17 @@ run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)" PERL5LIB="$(abs_top_
                autogen -L ../../sntp/include -L ../../sntp/ag-tpl \
                --writable
 
-noinst_SCRIPTS = ntpsweep
+bin_SCRIPTS=           $(NTPSWEEP_DB)
+sbin_SCRIPTS=          $(NTPSWEEP_DS)
+libexec_SCRIPTS=       $(NTPSWEEP_DL)
+noinst_SCRIPTS=                $(NTPSWEEP_NI)
+EXTRA_SCRIPTS=         ntpsweep
+
+if INSTALL_NTPSWEEP
+man_MANS=      ntpsweep.$(NTPSWEEP_MS)
+else
+noinst_MANS=   ntpsweep.$(NTPSWEEP_MS)
+endif
 
 EXTRA_DIST =                   \
        ntpsweep.in             \
@@ -22,7 +32,7 @@ EXTRA_DIST =                  \
 html_DATA = ntpsweep.html
 
 CLEANFILES = ntpsweep.1
-DISTCLEANFILES = config.log
+DISTCLEANFILES = config.log $(man_MANS) $(noinst_MANS)
 
 noinst_DATA =                  \
        ntpsweep.1              \

diff --git a/sntp/loc/README b/sntp/loc/README
index 6631be2ffff3c2379cacc3b48a7cee4e394c8356..07c746d6e08c8948d9c96606aeb14fb98116da1f 100644 (file)
--- a/sntp/loc/README
+++ b/sntp/loc/README
@@ -1,4 +1,5 @@
-If you look at the files here you should understand what is being done.
+If you look at the files here you should be able to figure out what is
+being done.
 
 ../scripts/genLocInfo handles the parsing of these files.
 

diff --git a/sntp/loc/darwin b/sntp/loc/darwin
index c563ff63c6f18cf9945bd18dd2ebe9adde26ed6e..c902860b6a07523b6c11c049239276ac5d550202 100644 (file)
--- a/sntp/loc/darwin
+++ b/sntp/loc/darwin
@@ -8,6 +8,7 @@ ntpdc,sbin,8
 ntpdsim,sbin,8
 ntpq,bin,8
 ntpsnmpd,sbin,8
+ntpsweep,noinst,8
 ntptime,sbin,8
 ntptrace,sbin,8
 sntp,bin,8

diff --git a/sntp/loc/debian b/sntp/loc/debian
index 2dbfc43f57c7c26c82289f607db357983aaf251a..7bc895ae010b6e4486ab70c7531a3d5c261a34a9 100644 (file)
--- a/sntp/loc/debian
+++ b/sntp/loc/debian
@@ -9,6 +9,7 @@ ntpdc,bin,1
 ntpdsim,sbin,8
 ntpq,bin,1
 ntpsnmpd,sbin,8
+ntpsweep,bin,1
 ntptime,sbin,8
 ntptrace,bin,1
 sntp,bin,1

diff --git a/sntp/loc/freebsd b/sntp/loc/freebsd
index 3dee191cca2b83c5158c2042bdfd90f88aa69385..7759e315693a264acc5b395e2eff436cf44e17d1 100644 (file)
--- a/sntp/loc/freebsd
+++ b/sntp/loc/freebsd
@@ -9,5 +9,6 @@ ntpdsim,sbin,8
 ntpq,sbin,8
 ntpsnmpd,sbin,8
 ntptime,sbin,8
+ntpsweep,noinst,8
 ntptrace,sbin,8
 sntp,sbin,8

diff --git a/sntp/loc/legacy b/sntp/loc/legacy
index a5c274bcb20a7ba62f9161e5ae7aa8fdbcc0fbd9..46c63a2831a6209f9a75d66ecadb8ad970aa2bc8 100644 (file)
--- a/sntp/loc/legacy
+++ b/sntp/loc/legacy
@@ -9,6 +9,7 @@ ntpdc,bin,1
 ntpdsim,bin,1
 ntpq,bin,1
 ntpsnmpd,bin,1
+ntpsweep,noinst,1
 ntptime,bin,1
 ntptrace,bin,1
 sntp,bin,1

diff --git a/sntp/loc/netbsd b/sntp/loc/netbsd
index b74aa0cfa01baa1e79c6196c4c03f1b477e4685c..e84f7899a1c92db84bb3ffff5ece0d98b88644fb 100644 (file)
--- a/sntp/loc/netbsd
+++ b/sntp/loc/netbsd
@@ -8,6 +8,7 @@ ntpdc,sbin,8
 ntpdsim,sbin,8
 ntpq,sbin,8
 ntpsnmpd,sbin,8
+ntpsweep,noinst,8
 ntptime,sbin,8
 ntptrace,sbin,8
 sntp,bin,1

diff --git a/sntp/loc/redhat b/sntp/loc/redhat
index 730379361de156ba0833a716ab4e4267c361dc76..a35a605460081ad27ed8b8e4fd32c30ea04b84e7 100644 (file)
--- a/sntp/loc/redhat
+++ b/sntp/loc/redhat
@@ -9,6 +9,7 @@ ntpdc,sbin,8
 ntpdsim,sbin,8
 ntpq,sbin,8
 ntpsnmpd,sbin,8
+ntpsweep,noinst,8
 ntptime,sbin,8
 ntptrace,sbin,8
 sntp,sbin,8

diff --git a/sntp/loc/solaris b/sntp/loc/solaris
index 51bddb7ec321ab45d9d9d71c7382f497dc8d655a..fcd8f42da42dc52ba7025b7e44963fe08daedbc2 100644 (file)
--- a/sntp/loc/solaris
+++ b/sntp/loc/solaris
@@ -9,6 +9,7 @@ ntpdc,sbin,1m
 ntpdsim,sbin,1m
 ntpq,sbin,1m
 ntpsnmpd,libexec,1m
+ntpsweep,noinst,1m
 ntptime,sbin,1m
 ntptrace,sbin,1m
 sntp,libexec,1m

diff --git a/sntp/m4/ntp_locinfo.m4 b/sntp/m4/ntp_locinfo.m4
index 3e41b5bb0078c5fbc2248260fcc277e263af7596..f045ac2609d56808d97641343a0eec57f005c169 100644 (file)
--- a/sntp/m4/ntp_locinfo.m4
+++ b/sntp/m4/ntp_locinfo.m4
@@ -2,6 +2,7 @@ dnl ######################################################################
 dnl @synopsis NTP_LOCINFO([SCRIPTSDIRPATH])
 dnl Location information:
 dnl - installation directory (*_DB for bin/, *_DL for libexec/, *_DS for sbin/)
+dnl   ... or *_NI for noinst_*
 dnl - man tag format (man or mdoc)
 dnl - man section (1, 1m, 1M, 8)
 
@@ -50,59 +51,79 @@ AC_SUBST([CALC_TICKADJ_DB])
 AC_SUBST([CALC_TICKADJ_DL])
 AC_SUBST([CALC_TICKADJ_DS])
 AC_SUBST([CALC_TICKADJ_MS])
+AC_SUBST([CALC_TICKADJ_NI])
 AC_SUBST([MANTAGFMT])
 AC_SUBST([NTPDATE_DB])
 AC_SUBST([NTPDATE_DL])
 AC_SUBST([NTPDATE_DS])
 AC_SUBST([NTPDATE_MS])
+AC_SUBST([NTPDATE_NI])
 AC_SUBST([NTPDC_DB])
 AC_SUBST([NTPDC_DL])
 AC_SUBST([NTPDC_DS])
 AC_SUBST([NTPDC_MS])
+AC_SUBST([NTPDC_NI])
 AC_SUBST([NTPDSIM_DB])
 AC_SUBST([NTPDSIM_DL])
 AC_SUBST([NTPDSIM_DS])
 AC_SUBST([NTPDSIM_MS])
+AC_SUBST([NTPDSIM_NI])
 AC_SUBST([NTPD_DB])
 AC_SUBST([NTPD_DL])
 AC_SUBST([NTPD_DS])
 AC_SUBST([NTPD_MS])
+AC_SUBST([NTPD_NI])
 AC_SUBST([NTPQ_DB])
 AC_SUBST([NTPQ_DL])
 AC_SUBST([NTPQ_DS])
 AC_SUBST([NTPQ_MS])
+AC_SUBST([NTPQ_NI])
 AC_SUBST([NTPSNMPD_DB])
 AC_SUBST([NTPSNMPD_DL])
 AC_SUBST([NTPSNMPD_DS])
 AC_SUBST([NTPSNMPD_MS])
+AC_SUBST([NTPSNMPD_NI])
+AC_SUBST([NTPSWEEP_DB])
+AC_SUBST([NTPSWEEP_DL])
+AC_SUBST([NTPSWEEP_DS])
+AC_SUBST([NTPSWEEP_MS])
+AC_SUBST([NTPSWEEP_NI])
+AM_CONDITIONAL([INSTALL_NTPSWEEP], [test -z "$NTPSWEEP_NI" ])
 AC_SUBST([NTPTIME_DB])
 AC_SUBST([NTPTIME_DL])
 AC_SUBST([NTPTIME_DS])
 AC_SUBST([NTPTIME_MS])
+AC_SUBST([NTPTIME_NI])
 AC_SUBST([NTPTRACE_DB])
 AC_SUBST([NTPTRACE_DL])
 AC_SUBST([NTPTRACE_DS])
 AC_SUBST([NTPTRACE_MS])
+AC_SUBST([NTPTRACE_NI])
 AC_SUBST([NTP_KEYGEN_DB])
 AC_SUBST([NTP_KEYGEN_DL])
 AC_SUBST([NTP_KEYGEN_DS])
 AC_SUBST([NTP_KEYGEN_MS])
+AC_SUBST([NTP_KEYGEN_NI])
 AC_SUBST([NTP_WAIT_DB])
 AC_SUBST([NTP_WAIT_DL])
 AC_SUBST([NTP_WAIT_DS])
 AC_SUBST([NTP_WAIT_MS])
+AC_SUBST([NTP_WAIT_NI])
 AC_SUBST([SNTP_DB])
 AC_SUBST([SNTP_DL])
 AC_SUBST([SNTP_DS])
 AC_SUBST([SNTP_MS])
+AC_SUBST([SNTP_NI])
 AC_SUBST([TICKADJ_DB])
 AC_SUBST([TICKADJ_DL])
 AC_SUBST([TICKADJ_DS])
 AC_SUBST([TICKADJ_MS])
+AC_SUBST([TICKADJ_NI])
 AC_SUBST([TIMETRIM_DB])
 AC_SUBST([TIMETRIM_DL])
 AC_SUBST([TIMETRIM_DS])
 AC_SUBST([TIMETRIM_MS])
+AC_SUBST([TIMETRIM_NI])
 
 ])dnl
 dnl ======================================================================

diff --git a/sntp/scripts/genLocInfo b/sntp/scripts/genLocInfo
index 0fccf32bcf71bf9f5ad44f7968d41b8e1806f8e3..d761c4c6635875dd5939bdb60594bc0c1a2bc1bc 100755 (executable)
--- a/sntp/scripts/genLocInfo
+++ b/sntp/scripts/genLocInfo
@@ -166,9 +166,10 @@ do
        esac
 
        case "$c,$d,$s" in
-        *,bin,*)  DB=bin ; DL= ; DS= ;;
-        *,libexec,*)  DB= ; DL=libexec ; DS= ;;
-        *,sbin,*) DB= ; DL= ; DS=sbin ;;
+        *,bin,*)  DB=bin ; DL= ; DS= ; NI= ;;
+        *,libexec,*)  DB= ; DL=libexec ; DS= ; NI= ;;
+        *,noinst,*)  DB= ; DL= ; DS= ; NI=noinst ;;
+        *,sbin,*) DB= ; DL= ; DS=sbin ; NI= ;;
         *) echo "Unrecognized input: <$c,$d,$s>" >&2
            touch $sdir/genLocInfo.rc1
            continue
@@ -194,18 +195,27 @@ do
            eval ${C}_DB=$c
            eval ${C}_DL=
            eval ${C}_DS=
+           eval ${C}_NI=
            ;;
         libexec)
            eval ${C}_DB=
            eval ${C}_DL=$c
            eval ${C}_DS=
+           eval ${C}_NI=
+           ;;
+        noinst)
+           eval ${C}_DB=
+           eval ${C}_DL=
+           eval ${C}_DS=
+           eval ${C}_NI=$c
            ;;
         sbin)
            eval ${C}_DB=
            eval ${C}_DL=
            eval ${C}_DS=$c
+           eval ${C}_NI=
            ;;
-        *) echo "$0: installdir <$d> must be bin, sbin, or libexec" >&2
+        *) echo "$0: installdir <$d> must be bin, sbin, libexec, or noinst" >&2
            exit 1
            ;;
        esac
@@ -215,10 +225,12 @@ do
        # echo "${C}_DB is <`eval echo '$'${C}_DB`>" >&2
        # echo "${C}_DL is <`eval echo '$'${C}_DL`>" >&2
        # echo "${C}_DS is <`eval echo '$'${C}_DS`>" >&2
+       # echo "${C}_NI is <`eval echo '$'${C}_NI`>" >&2
        # echo "${C}_MS is <`eval echo '$'${C}_MS`>" >&2
        echo "${C}_DB=`eval echo '$'${C}_DB`"
        echo "${C}_DL=`eval echo '$'${C}_DL`"
        echo "${C}_DS=`eval echo '$'${C}_DS`"
+       echo "${C}_NI=`eval echo '$'${C}_NI`"
        echo "${C}_MS=`eval echo '$'${C}_MS`"
 
        touch $sdir/genLocInfo.rc0