diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-09 16:17:17 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-09 16:17:17 -0800 |
| commit | a16d6f90eee0668d3658e5a9ad89854a8d95a99a (patch) | |
| tree | 5f163bcdf3b5a5f8d68e3c4a3c81f8307e551932 /make-dist | |
| parent | 5d4da32d4ec662febf3a2f59b713229867f743cb (diff) | |
| download | emacs-a16d6f90eee0668d3658e5a9ad89854a8d95a99a.tar.gz | |
Stop keeping doc/emacs/emacsver.texi in the repository
* configure.ac (doc/emacs/emacsver.texi): Generate it.
* make-dist (doc/emacs/emacsver.texi) [update]: No longer check it.
* doc/emacs/Makefile.in (top_srcdir, version): New, set by configure.
(doc-emacsver): New rule.
(bootstrap-clean, maintainer-clean): Delete emacsver.texi.
(emacsver.texi.in): Rename from emacsver.texi.
* admin/admin.el (set-version): No need to update doc/emacs/emacsver.texi.
(make-manuals-dist-output-variables): Add top_srcdir.
(make-manuals-dist--1): Handle @version@ specially.
* .bzrignore: Add doc/emacs/emacsver.texi.
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/make-dist b/make-dist index 3202f1f0e69..bbb0f95bb4c 100755 --- a/make-dist +++ b/make-dist @@ -169,9 +169,8 @@ fi echo Version number is $version if [ $update = yes ]; then - if ! grep -q "@set EMACSVER *${version}" doc/emacs/emacsver.texi || \ - ! grep -q "tree holds version *${version}" README; then - echo "WARNING: README and/or emacsver.texi have the wrong version number" + if ! grep -q "tree holds version *${version}" README; then + echo "WARNING: README has the wrong version number" echo "Consider running M-x set-version from admin/admin.el" sleep 5 fi |