update autofoo rules to ensure ChangeLog is generated if missing

diff --git a/Makefile.am b/Makefile.am
index aabcb6fbd206427fe27efe9d972cc8357d76ec56..cb42ea92b3b015537ce11cf2bf157ff3a2b12ff6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,12 @@ EXTRA_DIST = \
        $(sbin_SCRIPTS) \
        $(bin_SCRIPTS)
 
+DISTCLEANFILES = \
+       ChangeLog
+
+ChangeLog:
+       $(top_srcdir)/changelog.sh $(top_builddir)
+
 install-data-hook:
        install -d $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)
        [ -f $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)/msg.cache ] || touch $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)/msg.cache

diff --git a/autogen.sh b/autogen.sh
index a7028c278f34ea251b972c2e03ff41c6ce2a55e9..0b111c359450dfab696c3a081ef9b065a38a340a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,13 +6,6 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="PLD Linux Distribution rc-scripts"
 
-if [ -x ./changelog.sh ]; then
-       ./changelog.sh
-else
-       echo "Error: missing script changelog.sh to generate ChangeLog" >&2
-       exit 1
-fi
-
 cd "$srcdir"
 
     

diff --git a/changelog.sh b/changelog.sh
index 54baf7d5fb681f443d6b7cbb8b6c8fbe8d585599..a7f24dc06f69157cf6823d4cc9161eea96cc20bd 100755 (executable)
--- a/changelog.sh
+++ b/changelog.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 # Run this to generate ChangeLog.
 
+top_builddir=${1:-$(pwd)}
+
+set -e
+
+cd "$top_builddir"
+
 [ -e .git/shallow ] && git fetch --unshallow
 git log --format='%+ai [%h] %aN <%ae>%n%n%x09* %s' --stat | sed '1d' > ChangeLog