diff options
| author | Glenn Morris | 2015-05-06 17:02:06 -0400 |
|---|---|---|
| committer | Glenn Morris | 2015-05-06 17:02:06 -0400 |
| commit | 96b99c1bef79f3839e1a2f3c8e8d6f5625dc5cc3 (patch) | |
| tree | 92a9271ce0cc9f8d5aa8f19095ac7c6a25fa1963 | |
| parent | 49a9e73f0a7d52a3c452d466097b2d14b1b8e126 (diff) | |
| download | emacs-96b99c1bef79f3839e1a2f3c8e8d6f5625dc5cc3.tar.gz emacs-96b99c1bef79f3839e1a2f3c8e8d6f5625dc5cc3.zip | |
* Makefile.in (change-history-nocommit): New.
| -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 | |||
| 1088 | $(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile | 1088 | $(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile |
| 1089 | $(MAKE) all | 1089 | $(MAKE) all |
| 1090 | 1090 | ||
| 1091 | .PHONY: ChangeLog change-history change-history-commit | 1091 | .PHONY: ChangeLog change-history change-history-commit change-history-nocommit |
| 1092 | .PHONY: master-branch-is-current no-ChangeLog unchanged-history-files | 1092 | .PHONY: master-branch-is-current no-ChangeLog unchanged-history-files |
| 1093 | 1093 | ||
| 1094 | # The newest revision that should not appear in the generated ChangeLog. | 1094 | # The newest revision that should not appear in the generated ChangeLog. |
| @@ -1116,8 +1116,8 @@ unchanged-history-files: | |||
| 1116 | 1116 | ||
| 1117 | # Copy newer commit messages to the start of the ChangeLog history file, | 1117 | # Copy newer commit messages to the start of the ChangeLog history file, |
| 1118 | # and consider them to be older. | 1118 | # and consider them to be older. |
| 1119 | change-history: no-ChangeLog master-branch-is-current unchanged-history-files \ | 1119 | change-history-nocommit: no-ChangeLog master-branch-is-current \ |
| 1120 | ChangeLog | 1120 | unchanged-history-files ChangeLog |
| 1121 | (sed '/^;; [L]ocal Variables:/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \ | 1121 | (sed '/^;; [L]ocal Variables:/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \ |
| 1122 | >$(CHANGELOG_N).tmp | 1122 | >$(CHANGELOG_N).tmp |
| 1123 | new_origin=$$(git log --pretty=format:%H HEAD^!) && \ | 1123 | new_origin=$$(git log --pretty=format:%H HEAD^!) && \ |
| @@ -1125,6 +1125,8 @@ change-history: no-ChangeLog master-branch-is-current unchanged-history-files \ | |||
| 1125 | <Makefile.in >Makefile.in.tmp | 1125 | <Makefile.in >Makefile.in.tmp |
| 1126 | mv $(CHANGELOG_N).tmp $(CHANGELOG_N) | 1126 | mv $(CHANGELOG_N).tmp $(CHANGELOG_N) |
| 1127 | mv Makefile.in.tmp Makefile.in | 1127 | mv Makefile.in.tmp Makefile.in |
| 1128 | |||
| 1129 | change-history: change-history-nocommit | ||
| 1128 | $(MAKE) $@-commit | 1130 | $(MAKE) $@-commit |
| 1129 | 1131 | ||
| 1130 | # If 'make change-history' fails because the newest ChangeLog history | 1132 | # If 'make change-history' fails because the newest ChangeLog history |