* Makefile.in (ChangeLog): No longer pass "srcprefix"; cd instead.

* build-aux/gitlog-to-emacslog: Check called from right directory.
(srcprefix): Remove.

diff --git a/Makefile.in b/Makefile.in
index 8b5d6f738150a98c5dc7a7fa756366e6880368f0..2fdbf8d21020af628e596bafc4c03bf1e05868b0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1102,8 +1102,8 @@ CHANGELOG_N = ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX)
 # Convert git commit log to ChangeLog file.  make-dist uses this.
 # I guess this is PHONY so it always updates?
 ChangeLog:
-       $(AM_V_GEN)srcprefix=$(srcdir)/ \
-       $(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
+       $(AM_V_GEN)cd $(srcdir) && \
+         $(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
 
 # Check that we are in a good state for changing history.
 master-branch-is-current:

diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 4cf2ed619070c0b0b9ed87b875ce8284c76b90fd..134acf2ee5407d95fc09f7ab7c929a048869f906 100755 (executable)
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -39,19 +39,25 @@ while [ $# -gt 0 ]; do
   shift
 done
 
+if [ ! -f ChangeLog.$nmax ]; then
+    echo "Can't find ChangeLog.$nmax" >&2
+    echo "Must be run from the top source directory" >&2
+    exit 1
+fi
+
 if [ -f "$output" ]; then
-    [ ! "$force" ] && echo "$output exists" && exit 1
+    [ ! "$force" ] && echo "$output exists" >&2 && exit 1
     rm -f "$output" || exit 1
 fi
 
 # If this is not a Git repository, just generate an empty ChangeLog.
-test -d ${srcprefix}.git || {
+test -d .git || {
   >"$output"
   exit
 }
 
 # Use Gnulib's packaged ChangeLog generator.
-${srcprefix}build-aux/gitlog-to-changelog --ignore-matching='^; ' \
+./build-aux/gitlog-to-changelog --ignore-matching='^; ' \
   --format='%B' \
   "$gen_origin.." >"ChangeLog.tmp" || exit