* configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.

* configure: Regenerate.

* .bzrignore: Remove doc/emacs/emacsver.texi.

* doc/emacs/Makefile.in (distclean): Do not delete emacsver.texi.
* doc/emacs/emacsver.texi: New file, replacing emacsver.texi.in.

* admin/admin.el (set-version): Add doc/emacs/emacsver.texi.

diff --git a/ChangeLog b/ChangeLog
index 0849a25a2f6818d5538819db68ea12feb9f4fded..30f7e9e2f90463bc88b5ff21fdbf731793acd909 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+       * configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
        * configure.in: Combine some conditionals.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index dc220d997414960045f3347784a200645ccdcc27..b2a416f9467a70f7d34dc555005507ab52ad853c 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (set-version): Add doc/emacs/emacsver.texi.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
        * admin.el (set-version): No need to act on doc/ files any more.

diff --git a/admin/admin.el b/admin/admin.el
index 02b2ffac91b22ec2db515fd99dec0b02d46f66ac..7cd2c02fb58c1e75f89830e40342b44b209f9182 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -70,6 +70,9 @@ 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)

diff --git a/configure b/configure
index 79b719539d769b991cabf295cc6720b237f13b04..144d6dff5c308c3d56e9be27f3b992e0b3990f5d 100755 (executable)
--- a/configure
+++ b/configure
@@ -15017,7 +15017,7 @@ test "${prefix}" != NONE &&
 test "${exec_prefix}" != NONE &&
   exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
 
-ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile doc/emacs/emacsver.texi"
+ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -15726,7 +15726,6 @@ do
     "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;;
     "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
     "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
-    "doc/emacs/emacsver.texi") CONFIG_FILES="$CONFIG_FILES doc/emacs/emacsver.texi" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

diff --git a/configure.in b/configure.in
index 6bf599b96b79f39011cf701854c55a67d6df629b..51d7012128010dcba10dbe9eb7b505170a94f642 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3771,8 +3771,7 @@ dnl the use of force in the `epaths-force' rule in Makefile.in.
 AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \
        doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
        doc/lispref/Makefile src/Makefile \
-       lwlib/Makefile lisp/Makefile leim/Makefile \
-       doc/emacs/emacsver.texi, [
+       lwlib/Makefile lisp/Makefile leim/Makefile, [
 
 ### Make the necessary directories, if they don't exist.
 for dir in etc lisp ; do

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9eecf44abded03ddc6d0dde7db92e4489aa65562..468a789c1d4d69b111a2b410e4b071ef76ad7ee1 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (distclean): Do not delete emacsver.texi.
+       * emacsver.texi: New file, replacing emacsver.texi.in.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
        * emacsver.texi.in: New file.

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index d877a92f93aa2d5cc16a377550a58cce98d6683b..c50878ff533a8ded63840763a19c027fd29a2fb8 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -160,7 +160,6 @@ clean: mostlyclean
        rm -f emacs-manual-${version}.tar*
 
 distclean: clean
-       rm -f emacsver.texi
 
 ## In the standalone tarfile, the clean rule runs this.
 infoclean:

diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
new file mode 100644 (file)
index 0000000..ffa8605
--- /dev/null
+++ b/doc/emacs/emacsver.texi
@@ -0,0 +1,4 @@
+@c It would be nicer to generate this using configure and @version@.
+@c However, that would mean emacsver.texi would always be newer
+@c then the info files in release tarfiles.
+@set EMACSVER 24.0.50

diff --git a/doc/emacs/emacsver.texi.in b/doc/emacs/emacsver.texi.in
deleted file mode 100644 (file)
index d6ad0e8..0000000
--- a/doc/emacs/emacsver.texi.in
+++ /dev/null
@@ -1 +0,0 @@
-@set EMACSVER @version@