Commit e20b70bf authored by Glenn Morris's avatar Glenn Morris

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

(change-history-nocommit): Update footer regexp.
Ensure output script stays executable.
parent 387e1e19
......@@ -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
......
......@@ -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)
......
File mode changed from 100644 to 100755
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment