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

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

3 files changed, 2 insertions, 4 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index c6bff3cc4b8..d1c9477f146 100644
--- 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 2fdbf8d2102..5ac4e61efbc 100644
--- 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
index e38f8969bfe..e38f8969bfe 100644..100755
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog