summaryrefslogtreecommitdiff
path: root/admin/admin.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-10-08 18:41:21 -0700
committerGlenn Morris <rgm@gnu.org>2010-10-08 18:41:21 -0700
commitf7a31f1108819af24320aa33c9d2d5728ce0b83c (patch)
tree07454d84870d48c80e401eb6408c9ba9e2bcdd0c /admin/admin.el
parent3fb78d1f3341032d7bca0d4f6c708fb90d80a7ed (diff)
downloademacs-f7a31f1108819af24320aa33c9d2d5728ce0b83c.tar.gz
Set the version number in the texinfo manuals using configure.
* doc/misc/Makefile.in (emacsdir): New variable. ($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo. * doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi. * doc/lispref/Makefile.in (emacsdir): New variable. (MAKEINFO): Add -I $emacsdir. (dist): Copy emacsver.texi. * doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi: * doc/lispref/vol2.texi, doc/lispref/vol1.texi: Set EMACSVER by including emacsver.texi. * doc/emacs/emacsver.texi.in: New file. * doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi. * doc/emacs/Makefile.in (distclean): Delete emacsver.texi. (dist): Copy emacsver.texi. * admin/admin.el (set-version): No need to act on doc/ files any more. * configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi. * make-dist: Include doc/emacs/*.texi.in.
Diffstat (limited to 'admin/admin.el')
-rw-r--r--admin/admin.el23
1 files changed, 2 insertions, 21 deletions
diff --git a/admin/admin.el b/admin/admin.el
index 51bbecf4c57..02b2ffac91b 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,7 +1,7 @@
;;; admin.el --- utilities for Emacs administration
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@ -70,28 +70,10 @@ 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/emacs.texi" version
- (rx (and "EMACSVER" (1+ space)
- (submatch (1+ (in "0-9."))))))
- (set-version-in-file root "doc/lispref/elisp.texi" version
- (rx (and "EMACSVER" (1+ space)
- (submatch (1+ (in "0-9."))))))
- (set-version-in-file root "doc/lispref/vol1.texi" version
- (rx (and "EMACSVER" (1+ space)
- (submatch (1+ (in "0-9."))))))
- (set-version-in-file root "doc/lispref/vol2.texi" version
- (rx (and "EMACSVER" (1+ space)
- (submatch (1+ (in "0-9."))))))
- (set-version-in-file root "doc/lispref/book-spine.texinfo" version
- (rx (and "Emacs Version" (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)
(submatch (1+ (in "0-9."))))))
- (set-version-in-file root "doc/misc/faq.texi" version
- (rx (and "VER" (1+ space)
- (submatch (1+ (in "0-9."))))))
(set-version-in-file root "lib-src/makefile.w32-in" version
(rx (and "VERSION" (0+ space) "=" (0+ space)
(submatch (1+ (in "0-9."))))))
@@ -218,5 +200,4 @@ Root must be the root of an Emacs source tree."
(provide 'admin)
-;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
;;; admin.el ends here