From: Dave Hart <hart@ntp.org>
Date: Tue, 22 Dec 2009 02:01:20 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1419
X-Git-Tag: NTP_4_2_7P3~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f31dac902d8d34c3cfe4474607b4290456eceeda;p=thirdparty%2Fntp.git

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
---

f31dac902d8d34c3cfe4474607b4290456eceeda
diff --cc ChangeLog
index 5c502b53a,d56284069..728335955
--- a/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 scripts/Makefile.am
index ba3af17c5,a00adc646..7bde2cd15
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -1,36 -1,9 +1,37 @@@
 +NULL=
 +
- bin_SCRIPTS =			\
- 	ntp-wait		\
- 	ntptrace		\
- 	$(NULL)
+ if NTP_BINSUBDIR_IS_BIN
 -bin_SCRIPTS=	ntp-wait ntptrace
++bin_SCRIPTS =	ntp-wait ntptrace
+ else
 -sbin_SCRIPTS=	ntp-wait ntptrace
++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)