diff options
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index b792e7c5c86..75fd15001a4 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -1089,7 +1089,7 @@ bootstrap: bootstrap-clean | |||
| 1089 | $(MAKE) all | 1089 | $(MAKE) all |
| 1090 | 1090 | ||
| 1091 | .PHONY: ChangeLog change-history change-history-commit change-history-nocommit | 1091 | .PHONY: ChangeLog change-history change-history-commit change-history-nocommit |
| 1092 | .PHONY: master-branch-is-current unchanged-history-files | 1092 | .PHONY: emacs-25-branch-is-current unchanged-history-files |
| 1093 | 1093 | ||
| 1094 | CHANGELOG = ChangeLog | 1094 | CHANGELOG = ChangeLog |
| 1095 | emacslog = build-aux/gitlog-to-emacslog | 1095 | emacslog = build-aux/gitlog-to-emacslog |
| @@ -1106,8 +1106,8 @@ ChangeLog: | |||
| 1106 | ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) | 1106 | ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) |
| 1107 | 1107 | ||
| 1108 | # Check that we are in a good state for changing history. | 1108 | # Check that we are in a good state for changing history. |
| 1109 | master-branch-is-current: | 1109 | emacs-25-branch-is-current: |
| 1110 | git branch | grep -q '^\* master$$' | 1110 | git branch | grep -q '^\* emacs-25$$' |
| 1111 | unchanged-history-files: | 1111 | unchanged-history-files: |
| 1112 | x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \ | 1112 | x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \ |
| 1113 | test -z "$$x" | 1113 | test -z "$$x" |
| @@ -1117,7 +1117,7 @@ new_commit_regexp = ^commit [0123456789abcdef]* (inclusive) | |||
| 1117 | 1117 | ||
| 1118 | # Copy newer commit messages to the start of the ChangeLog history file, | 1118 | # Copy newer commit messages to the start of the ChangeLog history file, |
| 1119 | # and consider them to be older. | 1119 | # and consider them to be older. |
| 1120 | change-history-nocommit: master-branch-is-current unchanged-history-files | 1120 | change-history-nocommit: emacs-25-branch-is-current unchanged-history-files |
| 1121 | -rm -f ChangeLog.tmp | 1121 | -rm -f ChangeLog.tmp |
| 1122 | $(MAKE) ChangeLog CHANGELOG=ChangeLog.tmp | 1122 | $(MAKE) ChangeLog CHANGELOG=ChangeLog.tmp |
| 1123 | sed '/^This file records repository revisions/,$$d' \ | 1123 | sed '/^This file records repository revisions/,$$d' \ |