From: Dave Hart <hart@ntp.org>
Date: Thu, 17 Dec 2009 08:21:57 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-updatepoint
X-Git-Tag: NTP_4_2_7P2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b9c8d7981ac0cb233e8e05d1989d98ba83f92b5;p=thirdparty%2Fntp.git

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

bk: 4b29ea25wYorODCQke6b9Ct62YDTCg
---

8b9c8d7981ac0cb233e8e05d1989d98ba83f92b5
diff --cc ChangeLog
index 43ed81c9b,a0f8a12ee..0a31dde57
--- a/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 a00adc646,ba3af17c5..5b3c5cacd
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -1,9 -1,36 +1,37 @@@
+ NULL=
+ 
 -bin_SCRIPTS =			\
 -	ntp-wait		\
 -	ntptrace		\
 -	$(NULL)
 +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
- EXTRA_DIST = VersionName cvo.sh fixautomakedepsmagic genCommitLog	\
- 	genver hpadjtime.sh monitoring ntp-close ntp-groper ntp-restart	\
- 	ntp-status rc1 rc2 stats
+ 
+ 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)