* 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.

ChangeLog

+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.

admin/ChangeLog

+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.

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)

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;;

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

doc/emacs/ChangeLog

+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.

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:

doc/emacs/emacsver.texi

+@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

doc/emacs/emacsver.texi.in

-@set EMACSVER @version@