* build-aux/gitlog-to-emacslog: Get rid of "distprefix".

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5102575217eb767c720165040e9481f993a2d0cf..8b5d6f738150a98c5dc7a7fa756366e6880368f0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1091,24 +1091,20 @@ bootstrap: bootstrap-clean
 .PHONY: ChangeLog change-history change-history-commit change-history-nocommit
 .PHONY: master-branch-is-current unchanged-history-files
 
-CHANGELOG =
+CHANGELOG = ChangeLog
 emacslog = $(srcdir)/build-aux/gitlog-to-emacslog
-
-# 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)?
-# FIXME: test -f does not respect distprefix.
-ChangeLog:
-       @[ -n "${CHANGELOG}" ] || test ! -f ChangeLog
-       $(AM_V_GEN)distprefix=$(distprefix) srcprefix=$(srcdir)/ \
-       $(emacslog) . $(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)
 
+# 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)
+
 # Check that we are in a good state for changing history.
 master-branch-is-current:
        git branch | grep -q '^\* master$$'
@@ -1119,6 +1115,7 @@ unchanged-history-files:
 # Copy newer commit messages to the start of the ChangeLog history file,
 # and consider them to be older.
 change-history-nocommit: master-branch-is-current unchanged-history-files
+       -rm -f ChangeLog.tmp
        $(MAKE) ChangeLog CHANGELOG=ChangeLog.tmp
        (sed '/^;; [L]ocal Variables:/,$$d' <ChangeLog.tmp && cat $(CHANGELOG_N)) \
          >$(CHANGELOG_N).tmp
@@ -1136,7 +1133,7 @@ change-history: change-history-nocommit
 # file contains invalid text, fix the file by hand and then run
 # 'make change-history-commit'.
 change-history-commit:
-       git commit -m'; make $@' $(CHANGELOG_N) Makefile.in
+       git commit -m'; make $@' $(CHANGELOG_N) $(emacslog)
 
 .PHONY: check-declare