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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1419-updatepoint

bk: 4b29ea25wYorODCQke6b9Ct62YDTCg

diff --cc ChangeLog
index 43ed81c9b0f566767fdb7b6ba90ad4e4df374533,a0f8a12eed2bb5303643b4d11deda8c00219784d..0a31dde577670a1b00318aaaf87ef5b068601dbb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,6 +1,16 @@@
 +* [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir.
 +(4.2.7p1) 2009/12/15 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1348] ntpd Windows port should wait for sendto() completion.
 +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 +* [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 +(4.2.7p0) 2009/12/13 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 +* [Bug 1414] Enable "make distcheck" success with BSD make.
 +(4.2.7) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
+ ---
+ 
+ * 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 scripts/Makefile.am
index a00adc646759d6984db6e6f1053e23986a791c3f,ba3af17c5492007f9a310093e2fadfa58f5c9093..5b3c5cacdaa7a8c048eecff9d82949549e565939
--- 1/scripts/Makefile.am
--- 2/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -1,9 -1,36 +1,37 @@@
 -bin_SCRIPTS =                 \
 -      ntp-wait                \
 -      ntptrace                \
 -      $(NULL)
+ NULL=
+ 
- 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
 +if NTP_BINSUBDIR_IS_BIN
 +bin_SCRIPTS=  ntp-wait ntptrace
 +else
 +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)