(set-version): Handle configure.in. Adapt for doc/ directory layout

for manuals.

2 files changed, 11 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ffcaf196604..c3252d3ff70 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-version): Handle configure.in.  Adapt for doc/
+        directory layout for manuals.
+
 2007-12-01  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * FOR-RELEASE: Remove Gnus send mail problem.  Other Gnus bugs
diff --git a/admin/admin.el b/admin/admin.el
index a8b436171c5..a490442a44b 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -68,10 +68,14 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "README" version
                        (rx (and "version" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "man/emacs.texi" version
+  (set-version-in-file root "configure.in" version
+                       (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 "lispref/elisp.texi" version
+  (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 "lib-src/makefile.w32-in" version