diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-05-06 17:02:06 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-05-06 17:02:06 -0400 |
| commit | 96b99c1bef79f3839e1a2f3c8e8d6f5625dc5cc3 (patch) | |
| tree | 92a9271ce0cc9f8d5aa8f19095ac7c6a25fa1963 /Makefile.in | |
| parent | 49a9e73f0a7d52a3c452d466097b2d14b1b8e126 (diff) | |
| download | emacs-96b99c1bef79f3839e1a2f3c8e8d6f5625dc5cc3.tar.gz | |
* Makefile.in (change-history-nocommit): New.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 858a34d9423..dc7e8258498 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1088,7 +1088,7 @@ bootstrap: bootstrap-clean $(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile $(MAKE) all -.PHONY: ChangeLog change-history change-history-commit +.PHONY: ChangeLog change-history change-history-commit change-history-nocommit .PHONY: master-branch-is-current no-ChangeLog unchanged-history-files # The newest revision that should not appear in the generated ChangeLog. @@ -1116,8 +1116,8 @@ unchanged-history-files: # Copy newer commit messages to the start of the ChangeLog history file, # and consider them to be older. -change-history: no-ChangeLog master-branch-is-current unchanged-history-files \ - ChangeLog +change-history-nocommit: no-ChangeLog master-branch-is-current \ + unchanged-history-files ChangeLog (sed '/^;; [L]ocal Variables:/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \ >$(CHANGELOG_N).tmp new_origin=$$(git log --pretty=format:%H HEAD^!) && \ @@ -1125,6 +1125,8 @@ change-history: no-ChangeLog master-branch-is-current unchanged-history-files \ <Makefile.in >Makefile.in.tmp mv $(CHANGELOG_N).tmp $(CHANGELOG_N) mv Makefile.in.tmp Makefile.in + +change-history: change-history-nocommit $(MAKE) $@-commit # If 'make change-history' fails because the newest ChangeLog history |