diff options
| author | Paul Eggert | 2015-04-09 10:16:08 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-04-09 10:22:42 -0700 |
| commit | 7bb614e399300a80a68cd5196c1fd1f96d44e0af (patch) | |
| tree | d15253b1a9e8bb9b9b06b1e6f4ea812e2dd10f6b | |
| parent | 3311ace9c54a50b83a838e2eb7fa9565176e0c4f (diff) | |
| download | emacs-7bb614e399300a80a68cd5196c1fd1f96d44e0af.tar.gz emacs-7bb614e399300a80a68cd5196c1fd1f96d44e0af.zip | |
Adapt 'make change-history' to coding cookie
* Makefile.in (change-history): Adjust to change of format of
ChangeLog file, which now has a coding cookie before an indented
copyright notice.
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 55fb54a156c..a61cbc627b7 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -1110,7 +1110,7 @@ unchanged-history-files: | |||
| 1110 | # Copy newer commit messages to the start of the ChangeLog history file, | 1110 | # Copy newer commit messages to the start of the ChangeLog history file, |
| 1111 | # and consider them to be older. | 1111 | # and consider them to be older. |
| 1112 | change-history: ChangeLog unchanged-history-files | 1112 | change-history: ChangeLog unchanged-history-files |
| 1113 | (sed '/^Copyright/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \ | 1113 | (sed '/^;; Local Variables:/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \ |
| 1114 | >$(CHANGELOG_N).tmp | 1114 | >$(CHANGELOG_N).tmp |
| 1115 | new_origin=$$(git log --pretty=format:%H HEAD^!) && \ | 1115 | new_origin=$$(git log --pretty=format:%H HEAD^!) && \ |
| 1116 | sed 's/^\(gen_origin *= *\).*/\1'"$$new_origin/" \ | 1116 | sed 's/^\(gen_origin *= *\).*/\1'"$$new_origin/" \ |