Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1419

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1419-26-27-28

bk: 4b302870XgbpOECcGxE-ryWV3b-D0Q

diff --cc ChangeLog
index 5c502b53ae8fd036fdbe8ab2a64a8c3249ef31d1,d562840691ff11038f8fe7ff4dfcf338bfed448c..7283359558e24286799e7bb2bc1aa92eba54f7e1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,6 +1,22 @@@
  ---
  
+ * [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir.
 +* [Bug 1426] scripts/VersionName needs . on the search path.
 +* [Bug 1427] quote missing in ./build - shows up on NetBSD.
 +
 +---
 +(4.2.6p1-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* [Bug 1409] Put refclock_neoclock4x.c under the NTP COPYRIGHT notice.
 +  This should allow debian and other distros to add this refclock driver
 +  in further distro releases.
 +  Detect R2 hardware releases.
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 +* [Bug 1414] Enable "make distcheck" success with BSD make.
 +* [Bug 1415] Fix Mac OS X link problem.
 +* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 +* Build infrastructure updates to enable beta releases of ntp-stable.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
Simple merge

diff --cc ntpd/Makefile.am
Simple merge

diff --cc ntpdc/Makefile.am
Simple merge

diff --cc ntpq/Makefile.am
Simple merge

diff --cc ntpsnmpd/Makefile.am
Simple merge

diff --cc scripts/Makefile.am
index ba3af17c5492007f9a310093e2fadfa58f5c9093,a00adc646759d6984db6e6f1053e23986a791c3f..7bde2cd15e860cbecb3f1b04d160e3def78f36b7
--- 1/scripts/Makefile.am
--- 2/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -1,36 -1,9 +1,37 @@@
- bin_SCRIPTS =                 \
-       ntp-wait                \
-       ntptrace                \
-       $(NULL)
 +NULL=
 +
 -bin_SCRIPTS=  ntp-wait ntptrace
+ if NTP_BINSUBDIR_IS_BIN
 -sbin_SCRIPTS= ntp-wait ntptrace
++bin_SCRIPTS = ntp-wait ntptrace
+ else
 -noinst_SCRIPTS=       calc_tickadj checktime freq_adj html2man mkver ntpsweep ntpver plot_summary summary
 -EXTRA_DIST = VersionName cvo.sh fixautomakedepsmagic genCommitLog     \
 -      genver hpadjtime.sh monitoring ntp-close ntp-groper ntp-restart \
 -      ntp-status rc1 rc2 stats
++sbin_SCRIPTS =        ntp-wait ntptrace
+ endif
 +
 +noinst_SCRIPTS =              \
 +      calc_tickadj            \
 +      checktime               \
 +      freq_adj                \
 +      html2man                \
 +      mkver                   \
 +      ntpsweep                \
 +      ntpver                  \
 +      plot_summary            \
 +      summary                 \
 +      $(NULL)
 +
 +EXTRA_DIST =                  \
 +      cvo.sh                  \
 +      fixautomakedepsmagic    \
 +      genCommitLog            \
 +      genver                  \
 +      hpadjtime.sh            \
 +      monitoring              \
 +      ntp-close               \
 +      ntp-groper              \
 +      ntp-restart             \
 +      ntp-status              \
 +      rc1                     \
 +      rc2                     \
 +      stats                   \
 +      UpdatePoint             \
 +      VersionName             \
 +      $(NULL)

diff --cc sntp/Makefile.am
Simple merge