* Makefile.in: Fixes for recent change-history changes.

(change-history-nocommit): Update footer regexp.
Ensure output script stays executable.

diff --git a/ChangeLog.2 b/ChangeLog.2
index c6bff3cc4b83b4ac8089cdcff42eee6b9e808d5c..d1c9477f1461a9e9ac9a643e96ca30f592a27779 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1154,8 +1154,6 @@
        as the default value instead of initial input
        (http://lists.gnu.org/archive/html/emacs-devel/2015-04/msg01182.html).
 
-See ChangeLog.2 for earlier changes.
-
 2015-04-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        Don't freeze with unreadable processes

diff --git a/Makefile.in b/Makefile.in
index 2fdbf8d21020af628e596bafc4c03bf1e05868b0..5ac4e61efbcbad7759fed2e84233c693c8c1bcde 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1117,12 +1117,12 @@ unchanged-history-files:
 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)) \
+       (sed '/^See ChangeLog.[0-9]* for earlier/,$$d' <ChangeLog.tmp && cat $(CHANGELOG_N)) \
          >$(CHANGELOG_N).tmp
        rm ChangeLog.tmp
        new_origin=$$(git log --pretty=format:%H HEAD^!) && \
        sed 's/^\(gen_origin=\).*/\1'"$$new_origin/" \
-         < $(emacslog) > $(emacslog).tmp
+         < $(emacslog) > $(emacslog).tmp && chmod +x $(emacslog).tmp
        mv $(CHANGELOG_N).tmp $(CHANGELOG_N)
        mv $(emacslog).tmp $(emacslog)
 

diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
old mode 100644 (file)
new mode 100755 (executable)