diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-05-10 12:01:39 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-05-10 12:01:39 -0700 |
| commit | e20b70bf505a9ac699cfdba534fe20210923f474 (patch) | |
| tree | ae9b1bd2009558e70caad0c207c6c7b7eee37aa0 | |
| parent | 387e1e19430c12eb7db5b58f861c4e85613476f8 (diff) | |
| download | emacs-e20b70bf505a9ac699cfdba534fe20210923f474.tar.gz | |
* Makefile.in: Fixes for recent change-history changes.
(change-history-nocommit): Update footer regexp.
Ensure output script stays executable.
| -rw-r--r-- | ChangeLog.2 | 2 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | build-aux/gitlog-to-emacslog | 0 |
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 |