From: Glenn Morris Date: Sun, 10 May 2015 19:01:39 +0000 (-0700) Subject: * Makefile.in: Fixes for recent change-history changes. X-Git-Tag: emacs-25.0.90~2127 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e20b70bf505a9ac699cfdba534fe20210923f474;p=emacs.git * 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 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 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_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 new mode 100755