Add support for installing programs and scripts to libexec

bk: 4e2d0b7dZLn4nkD6Gpkh8A_DCdIurQ

diff --git a/ChangeLog b/ChangeLog
index ed3b8ddc718517ee103f12977ccdd2b1ab27dcfb..df76f1c3a23075bcd2a80a99c383d0962d126e43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 * [Bug 1608] from 4.2.6p4-RC2: Parse Refclock driver should honor
   trusttime.
+* Add support for installing programs and scripts to libexec.
 (4.2.7p193) 2011/07/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1970] from 4.2.6p4-RC2: UNLINK_EXPR_SLIST() causes crash if list
   is empty.

diff --git a/adjtimed/Makefile.am b/adjtimed/Makefile.am
index 439c9004dd121b64f85886af7a4678691855d5fc..a6328a1b0bb1271174ab6e3a679c5cccaff7d22c 100644 (file)
--- a/adjtimed/Makefile.am
+++ b/adjtimed/Makefile.am
@@ -1,6 +1,7 @@
 ## adjtimed Makefile.am
 
 bin_PROGRAMS = $(ADJTIMED_DB)
+libexec_PROGRAMS = $(ADJTIMED_DL)
 sbin_PROGRAMS =        $(ADJTIMED_DS)
 
 BUILT_SOURCES =

diff --git a/configure.ac b/configure.ac
index 15c79775a55e8ca75ceaed232c949f217511e31d..4ee34e1088dff3b7fe6d2406d660ff0b48918b7b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2872,6 +2872,7 @@ case "$ans" in
        [Do we need HPUX adjtime() library support?])
     ;;
  *) ADJTIMED_DB=
+    ADJTIMED_DL=
     ADJTIMED_DS=
     ADJTIMED_MS=
     ;;
@@ -3448,6 +3449,7 @@ case "$ac_cv_make_ntptime" in
     ;;
  *)
     NTPTIME_DB=
+    NTPTIME_DL=
     NTPTIME_DS=
     NTPTIME_MS=
     ;;
@@ -3498,6 +3500,7 @@ case "$ntp_cv_make_tickadj" in
     ;;
  *)
     TICKADJ_DB=
+    TICKADJ_DL=
     TICKADJ_DS=
     TICKADJ_MS=
     ;;
@@ -3526,6 +3529,7 @@ case "$ntp_cv_make_timetrim" in
     MAKE_TIMETRIM=timetrim
     ;;
  *) TIMETRIM_DB=
+    TIMETRIM_DL=
     TIMETRIM_DS=
     TIMETRIM_MS=
     ;;
@@ -3552,6 +3556,7 @@ case "$ans" in
     ;;
  *)
     NTPDSIM_DB=
+    NTPDSIM_DL=
     NTPDSIM_DS=
     NTPDSIM_MS=
     ;;
@@ -3653,6 +3658,7 @@ AC_SUBST([MAKE_NTPSNMPD])
 case "$MAKE_NTPSNMPD" in
  '')
     NTPSNMPD_DB=
+    NTPSNMPD_DL=
     NTPSNMPD_DS=
     NTPSNMPD_MS=
     ;;
@@ -4083,6 +4089,11 @@ case "$SNTP_DB" in
  *) ac_configure_args=" --with-binsubdir=bin${ac_configure_args}" ;;
 esac
 
+case "$SNTP_DL" in
+ '') ;;
+ *) ac_configure_args=" --with-binsubdir=libexec${ac_configure_args}" ;;
+esac
+
 case "$SNTP_DS" in
  '') ;;
  *) ac_configure_args=" --with-binsubdir=sbin${ac_configure_args}" ;;

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 979219a7067b78a1f618248b0b8da49d4abba6f5..675d258fc811cc6aca6ac3f2b2d97852d6349ecb 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -1,6 +1,7 @@
 NULL=
 
 bin_PROGRAMS=  $(NTPD_DB) $(NTPDSIM_DB)
+libexec_PROGRAMS=      $(NTPD_DL) $(NTPDSIM_DL)
 sbin_PROGRAMS= $(NTPD_DS) $(NTPDSIM_DS)
 
 noinst_LIBRARIES=      libntpd.a

diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index 9149370be709b0471ead6d825e464cb10d0a0152..00e87542c66b1be83b54b8613da2a1e5bfa38441 100644 (file)
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -4,6 +4,7 @@ BUILT_SOURCES =
 CLEANFILES =
 
 bin_PROGRAMS = $(NTPDATE_DB)
+libexec_PROGRAMS = $(NTPDATE_DL)
 sbin_PROGRAMS = $(NTPDATE_DS)
 
 EXTRA_PROGRAMS = ntpdate ntptimeset

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index edaf9c3836007ac28b6be25b6817e20c1fab7d5b..a717c909d40ae7f1a964f70de5048d8fee901f53 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -1,6 +1,7 @@
 NULL=
 
 bin_PROGRAMS=  $(NTPDC_DB)
+libexec_PROGRAMS=      $(NTPDC_DL)
 sbin_PROGRAMS= $(NTPDC_DS)
 
 EXTRA_PROGRAMS=        ntpdc ntpdc-layout

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 4ca9256cc7a405c72f066d4cba07afcb2a512c8e..79155c04c7ba362e2d9a2214516d0a0ca9e367d1 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -2,6 +2,7 @@ NULL=
 
 EXTRA_PROGRAMS=        ntpq
 bin_PROGRAMS=  $(NTPQ_DB)
+libexec_PROGRAMS=      $(NTPQ_DL)
 sbin_PROGRAMS= $(NTPQ_DS)
 
 AM_CFLAGS = $(CFLAGS_NTP)

diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index 05e3fc9f2de3bbca4abc5c5dec6099d5b301b59b..9bbfa080a741c0575c190ef83f9897bba0d82aa7 100644 (file)
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -1,6 +1,7 @@
 NULL=
 
 bin_PROGRAMS=  $(NTPSNMPD_DB)
+libexec_PROGRAMS=      $(NTPSNMPD_DL)
 sbin_PROGRAMS= $(NTPSNMPD_DS)
 
 EXTRA_PROGRAMS=        ntpsnmpd

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 8c26f5740b29edb04feebb04ff97dd4177e30b2f..10eb6c688eb97fff97639d28e161361c8c7d42c3 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -19,6 +19,7 @@ std_def_list =                                                        \
 
 EXTRA_SCRIPTS =        ntp-wait ntptrace
 bin_SCRIPTS =  $(NTP_WAIT_DB) $(NTPTRACE_DB)
+libexec_SCRIPTS =      $(NTP_WAIT_DL) $(NTPTRACE_DL)
 sbin_SCRIPTS = $(NTP_WAIT_DS) $(NTPTRACE_DS)
 
 noinst_SCRIPTS =               \

diff --git a/scripts/genLocInfo b/scripts/genLocInfo
index 8becca37dc1d2f7e7a6046aa8ae66c5cf020c3b5..43c6adfa17ee26af2380b09a464c01972bdbfed0 100755 (executable)
--- a/scripts/genLocInfo
+++ b/scripts/genLocInfo
@@ -127,8 +127,9 @@ do
        esac
 
        case "$c,$d,$s" in
-        *,bin,*)  DB=bin ; DS= ;;
-        *,sbin,*) DB= ; DS=sbin ;;
+        *,bin,*)  DB=bin ; DL= ; DS= ;;
+        *,libexec,*)  DB= ; DL=libexec ; DS= ;;
+        *,sbin,*) DB= ; DL= ; DS=sbin ;;
         *) echo "Unrecognized input: <$c,$d,$s>" >&2
            RC=1
            continue
@@ -146,15 +147,22 @@ do
 
        # Should be OK, mostly...
        C=`echo $c | sed -e 'y/abcdefghijklmnopqrstuvwxyz-/ABCDEFGHIJKLMNOPQRSTUVWXYZ_/'`
-       # echo "c: <$c>, C: <$C>, DB: <$DB>, DS: <$DS>" >&2
+       # echo "c: <$c>, C: <$C>, DB: <$DB>, DL: <$DL>, DS: <$DS>" >&2
 
        case "$d" in
         bin)
            eval ${C}_DB=$c
+           eval ${C}_DL=
+           eval ${C}_DS=
+           ;;
+        libexec)
+           eval ${C}_DB=
+           eval ${C}_DL=$c
            eval ${C}_DS=
            ;;
         sbin)
            eval ${C}_DB=
+           eval ${C}_DL=
            eval ${C}_DS=$c
            ;;
         *) echo "$0: GRONK: d" >&2
@@ -165,9 +173,11 @@ do
 
        # echo "<$c> gets installed in <$d> with a <$s> manpage suffix" >&2
        # 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}_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}_MS=`eval echo '$'${C}_MS`"
     else

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 8713e9c192f93ff65ccd78a133ac9e0420d43a74..bfdb2d339b5c6a5bef9362175246cf9cfe65dda3 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -34,6 +34,7 @@ std_def_list =                                                \
 EXTRA_PROGRAMS = sntp
 
 bin_PROGRAMS = $(SNTP_DB)
+libexec_PROGRAMS =     $(SNTP_DL)
 sbin_PROGRAMS =        $(SNTP_DS)
 
 ##

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 5b71d5a411589b2e426cbfeb07aebcc3813c4468..d410180ecf4b502c0619554b380a156ea4c49ac4 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -73,6 +73,7 @@ NTP_WITHSNTP
 #
 # When configure is invoked from the main NTP directory, we will have:
 # - SNTP_DB=sntp (if we are installing sntp in bindir, empty otherwise)
+# - SNTP_DL=sntp (if we are installing sntp in libexecdir, empty otherwise)
 # - SNTP_DS=sntp (if we are installing sntp in sbindir, empty otherwise)
 # - SNTP_MS={1,1m,1M,8}
 # - MANTAGFMT={man,mdoc}
@@ -82,7 +83,7 @@ AC_ARG_WITH(
     [binsubdir],
     [AS_HELP_STRING(
        [--with-binsubdir],
-       [bin ={bin,sbin}]
+       [bin ={bin,libexec,sbin}]
     )],
     [use_binsubdir="$withval"],
     [use_binsubdir="bin"]
@@ -90,19 +91,27 @@ AC_ARG_WITH(
 case "$use_binsubdir" in
  bin)
     SNTP_DB=$SNTP
+    SNTP_DL=
+    SNTP_DS=
+    ;;
+ libexec)
+    SNTP_DB=
+    SNTP_DL=$SNTP
     SNTP_DS=
     ;;
  sbin)
     SNTP_DB=
+    SNTP_DL=
     SNTP_DS=$SNTP
     ;;
  *)
-    AC_MSG_ERROR([<$use_binsubdir> is illegal - must be "bin" or "sbin"])
+    AC_MSG_ERROR([<$use_binsubdir> is illegal - must be "bin" "libexec" or "sbin"])
     ;;
 esac
 AC_MSG_RESULT([$use_binsubdir])
 
 AC_SUBST([SNTP_DB])
+AC_SUBST([SNTP_DL])
 AC_SUBST([SNTP_DS])
 
 AC_MSG_CHECKING([for manual page installation section])

diff --git a/sntp/m4/ntp_locinfo.m4 b/sntp/m4/ntp_locinfo.m4
index 4b479cd7dd260d214affa60498a19dbee96d24d4..433aaaa17136210ae56ddfce5fd1aca2210eaa01 100644 (file)
--- a/sntp/m4/ntp_locinfo.m4
+++ b/sntp/m4/ntp_locinfo.m4
@@ -1,6 +1,6 @@
 dnl ######################################################################
 dnl Location information:
-dnl - installation directory (*_DB for bin/, *_DS for sbin/)
+dnl - installation directory (*_DB for bin/, *_DL for libexec/, *_DS for sbin/)
 dnl - man tag format (man or mdoc)
 dnl - man section (1, 1m, 1M, 8)
 
@@ -34,42 +34,55 @@ esac
 
 AC_SUBST(MANTAGFMT)
 AC_SUBST(NTPDATE_DB)
+AC_SUBST(NTPDATE_DL)
 AC_SUBST(NTPDATE_DS)
 AC_SUBST(NTPDATE_MS)
 AC_SUBST(NTPDC_DB)
+AC_SUBST(NTPDC_DL)
 AC_SUBST(NTPDC_DS)
 AC_SUBST(NTPDC_MS)
 AC_SUBST(NTPDSIM_DB)
+AC_SUBST(NTPDSIM_DL)
 AC_SUBST(NTPDSIM_DS)
 AC_SUBST(NTPDSIM_MS)
 AC_SUBST(NTPD_DB)
+AC_SUBST(NTPD_DL)
 AC_SUBST(NTPD_DS)
 AC_SUBST(NTPD_MS)
 AC_SUBST(NTPQ_DB)
+AC_SUBST(NTPQ_DL)
 AC_SUBST(NTPQ_DS)
 AC_SUBST(NTPQ_MS)
 AC_SUBST(NTPSNMPD_DB)
+AC_SUBST(NTPSNMPD_DL)
 AC_SUBST(NTPSNMPD_DS)
 AC_SUBST(NTPSNMPD_MS)
 AC_SUBST(NTPTIME_DB)
+AC_SUBST(NTPTIME_DL)
 AC_SUBST(NTPTIME_DS)
 AC_SUBST(NTPTIME_MS)
 AC_SUBST(NTPTRACE_DB)
+AC_SUBST(NTPTRACE_DL)
 AC_SUBST(NTPTRACE_DS)
 AC_SUBST(NTPTRACE_MS)
 AC_SUBST(NTP_KEYGEN_DB)
+AC_SUBST(NTP_KEYGEN_DL)
 AC_SUBST(NTP_KEYGEN_DS)
 AC_SUBST(NTP_KEYGEN_MS)
 AC_SUBST(NTP_WAIT_DB)
+AC_SUBST(NTP_WAIT_DL)
 AC_SUBST(NTP_WAIT_DS)
 AC_SUBST(NTP_WAIT_MS)
 AC_SUBST(SNTP_DB)
+AC_SUBST(SNTP_DL)
 AC_SUBST(SNTP_DS)
 AC_SUBST(SNTP_MS)
 AC_SUBST(TICKADJ_DB)
+AC_SUBST(TICKADJ_DL)
 AC_SUBST(TICKADJ_DS)
 AC_SUBST(TICKADJ_MS)
 AC_SUBST(TIMETRIM_DB)
+AC_SUBST(TIMETRIM_DL)
 AC_SUBST(TIMETRIM_DS)
 AC_SUBST(TIMETRIM_MS)
 

diff --git a/util/Makefile.am b/util/Makefile.am
index 40990a9ff30f646babd62c43f3dc05bda6a407f1..01847d6b41f024ce79cfda8f2700263f51c2c51e 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,7 @@
 NULL=
 
 bin_PROGRAMS=  $(NTP_KEYGEN_DB) $(NTPTIME_DB) $(TICKADJ_DB) $(TIMETRIM_DB)
+libexec_PROGRAMS=      $(NTP_KEYGEN_DL) $(NTPTIME_DL) $(TICKADJ_DL) $(TIMETRIM_DL)
 sbin_PROGRAMS= $(NTP_KEYGEN_DS) $(NTPTIME_DS) $(TICKADJ_DS) $(TIMETRIM_DS)
 
 EXTRA_PROGRAMS=        audio-pcm byteorder hist jitter kern longsize ntp-keygen \