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 /admin/admin.el | |
| 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 'admin/admin.el')
| -rw-r--r-- | admin/admin.el | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/admin/admin.el b/admin/admin.el index 48e083d7789..14d851eb202 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -94,9 +94,6 @@ Root must be the root of an Emacs source tree." (rx (and "AC_INIT" (1+ (not (in ?,))) ?, (0+ space) (submatch (1+ (in "0-9.")))))) - (set-version-in-file root "doc/emacs/emacsver.texi" version - (rx (and "EMACSVER" (1+ space) - (submatch (1+ (in "0-9.")))))) (set-version-in-file root "doc/man/emacs.1" version (rx (and ".TH EMACS" (1+ not-newline) "GNU Emacs" (1+ space) @@ -611,7 +608,7 @@ style=\"text-align:left\">") (defconst make-manuals-dist-output-variables - `(("@srcdir@" . ".") + `(("@\\(top_\\)?srcdir@" . ".") ; top_srcdir is wrong, but not used ("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .") ("^\\(clean:.*\\)" . "\\1 infoclean") ("@MAKEINFO@" . "makeinfo") @@ -655,11 +652,13 @@ style=\"text-align:left\">") (string-match-p "\\.\\(eps\\|pdf\\)\\'" file))) (copy-file file stem))) (with-temp-buffer - (insert-file-contents (format "../doc/%s/Makefile.in" type)) - (dolist (cons make-manuals-dist-output-variables) - (while (re-search-forward (car cons) nil t) - (replace-match (cdr cons) t)) - (goto-char (point-min))) + (let ((outvars make-manuals-dist-output-variables)) + (push `("@version@" . ,version) outvars) + (insert-file-contents (format "../doc/%s/Makefile.in" type)) + (dolist (cons outvars) + (while (re-search-forward (car cons) nil t) + (replace-match (cdr cons) t)) + (goto-char (point-min)))) (let (ats) (while (re-search-forward "@[a-zA-Z_]+@" nil t) (setq ats t) |