* build-aux/gitlog-to-emacslog: Don't hard-code "ChangeLog.2".

* Makefile.in (ChangeLog): Pass -n to gitlog-to-emacslog.

diff --git a/Makefile.in b/Makefile.in
index 7ae81b0b21717fcd4f538e4406a83f19e50f4854..6f7d22978b2fd1101f96762963b39bdaa67b516a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1093,19 +1093,18 @@ bootstrap: bootstrap-clean
 
 CHANGELOG = ChangeLog
 emacslog = $(srcdir)/build-aux/gitlog-to-emacslog
+# The ChangeLog history files are called ChangeLog.1, ChangeLog.2, ...,
+# ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX).  $(CHANGELOG_N) stands for
+# the newest (highest-numbered) ChangeLog history file.
+CHANGELOG_HISTORY_INDEX_MAX = 2
+CHANGELOG_N = ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX)
 
 # Convert git commit log to ChangeLog file.  make-dist uses this.
 # I guess this is PHONY because it generates in distprefix (which is
 # non-nil when called from make-dist)?
 ChangeLog:
        $(AM_V_GEN)distprefix=$(distprefix) srcprefix=$(srcdir)/ \
-       $(emacslog) -o $(CHANGELOG)
-
-# The ChangeLog history files are called ChangeLog.1, ChangeLog.2, ...,
-# ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX).  $(CHANGELOG_N) stands for
-# the newest (highest-numbered) ChangeLog history file.
-CHANGELOG_HISTORY_INDEX_MAX = 2
-CHANGELOG_N = ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX)
+       $(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 0db91d52205239d15bbabe802d5d38a62ff5d89c..28953d725f5254fd92117235d2f47926634f55af 100755 (executable)
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -26,11 +26,13 @@ export LC_ALL
 gen_origin=2c1b8604946efbcd8ec5dd6c6dda7541ce4fc3c0
 force=
 output=ChangeLog
+nmax=2
 
 while [ $# -gt 0 ]; do
   case "$1" in
       -g|--gen-origin) gen_origin="$2" ; shift ;;
       -f|--force) force=1 ;;
+      -n|--nmax) nmax="$2"; shift ;;
       -o|--output) output="$2" ; shift ;;
       *) echo "Unrecognized argument: $1" >&2; exit 1 ;;
   esac
@@ -86,12 +88,12 @@ if test -s "${distprefix}ChangeLog.tmp"; then
   sed -n '
     1i\
 
-    /^See ChangeLog.1 for earlier/,${
-       s/ChangeLog\.1/ChangeLog.2/
+    /^See ChangeLog.[0-9]* for earlier/,${
+       s/ChangeLog\.[0-9]*/ChangeLog.'$nmax'/
        s/\(Copyright[ (C)]*\)[0-9]*-[0-9]*/\1'"$year_range"'/
        p
     }
-  ' <ChangeLog.2 >>"${distprefix}ChangeLog.tmp" || exit
+  ' <ChangeLog.$nmax >>"${distprefix}ChangeLog.tmp" || exit
 fi
 
 # Install the generated ChangeLog.