summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-05-08 21:02:36 -0400
committerGlenn Morris <rgm@gnu.org>2015-05-08 21:02:36 -0400
commitdeb845418b4c5728170f30f7f9b9f930979a562d (patch)
tree5d538d764ce1d8c2d0f6da41055aab0b8367a463 /Makefile.in
parent22e3ec2b53295ab2dd5f5a70e330f920abbfdeea (diff)
downloademacs-deb845418b4c5728170f30f7f9b9f930979a562d.tar.gz
* build-aux/gitlog-to-emacslog: Don't hard-code "ChangeLog.2".
* Makefile.in (ChangeLog): Pass -n to gitlog-to-emacslog.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in13
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index 7ae81b0b217..6f7d22978b2 100644
--- 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: