Clean up the ChangeLog generation

bk: 44d3a75csvrNUgXHQ-Bzrk6zrkGG_A

diff --git a/Makefile.am b/Makefile.am
index b3220569b018adb0417812f80bb1f7a2978af2bf..d71f2aa9a6559455a6282379dd1e2d43e1b73574 100644 (file)
--- 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 1f8724c797a8145d26001e4022e97e15e6ee5d4e..1535800fb8210d4d31d4aa2858df15ddb63e64ce 100644 (file)
--- 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 (file)
index 0000000..7b55eac
--- /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