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

4 files changed, 9 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9eecf44abde..468a789c1d4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,10 @@
 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.
         * emacs.texi: Set EMACSVER by including emacsver.texi.
         * Makefile.in (distclean): Delete emacsver.texi.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index d877a92f93a..c50878ff533 100644
--- 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
index 00000000000..ffa860585ba
--- /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
index d6ad0e8da02..00000000000
--- a/doc/emacs/emacsver.texi.in
+++ /dev/null
@@ -1 +0,0 @@
-@set EMACSVER @version@