From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 4 Aug 2006 20:00:28 +0000 (-0400)
Subject: Clean up the ChangeLog generation
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3801e47a43dccc17869e0062a91ddbfc5c5a661;p=thirdparty%2Fntp.git

Clean up the ChangeLog generation

bk: 44d3a75csvrNUgXHQ-Bzrk6zrkGG_A
---

diff --git a/Makefile.am b/Makefile.am
index b3220569b0..d71f2aa9a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,11 +129,9 @@ dist-hook:
 
 ChangeLog: FRC.ChangeLog
 	cd $(srcdir)					\
-	&& . packageinfo.sh				\
-	&& ARGS="-hr$${CLTAG}.."			\
-	&& ( bk -R prs $${ARGS} -nd':I:'		\
-	   | bk changes -m -v - > ChangeLog.new )	\
-	&& mv ChangeLog.new ChangeLog
+	&& /bin/test -e ChangeLog			\
+		-a SCCS/s.ChangeSet -ot ChangeLog	\
+	|| scripts/genChangeLog
 
 # HMS: The following seems to be a work-in-progress...
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1f8724c797..1535800fb8 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,5 @@
 bin_SCRIPTS=	ntp-wait ntptrace
 noinst_SCRIPTS=	calc_tickadj checktime freq_adj html2man mkver ntpsweep ntpver plot_summary summary
-EXTRA_DIST = VersionName fixautomakedepsmagic genver hpadjtime.sh monitoring \
-	ntp-close ntp-groper ntp-restart ntp-status rc1 rc2 stats
+EXTRA_DIST = VersionName fixautomakedepsmagic genChangeLog genver	\
+	hpadjtime.sh monitoring ntp-close ntp-groper ntp-restart	\
+	ntp-status rc1 rc2 stats
diff --git a/scripts/genChangeLog b/scripts/genChangeLog
new file mode 100644
index 0000000000..7b55eacd29
--- /dev/null
+++ b/scripts/genChangeLog
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+. packageinfo.sh
+bk -R prs -hr${CLTAG}.. -nd':I:' | bk changes -m -v - > ChangeLog.new
+mv ChangeLog.new ChangeLog