Mercurial > emacs

changeset 110881:b71665f4f9ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Glenn Morris <rgm@gnu.org>
date Sat, 09 Oct 2010 10:59:55 -0700
parents eff459e2beb7
children b8bcd2311f78
files .bzrignore ChangeLog admin/ChangeLog admin/admin.el configure configure.in doc/emacs/ChangeLog doc/emacs/Makefile.in doc/emacs/emacsver.texi doc/emacs/emacsver.texi.in
diffstat 10 files changed, 22 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.bzrignore	Sat Oct 09 17:44:44 2010 +0200
+++ b/.bzrignore	Sat Oct 09 10:59:55 2010 -0700
@@ -29,7 +29,6 @@
 TAGS-LISP
 info/*
 admin/unidata/unidata.txt
-doc/emacs/emacsver.texi
 leim/leim-list.el
 leim/quail/*.el
 leim/changed.misc
--- a/ChangeLog	Sat Oct 09 17:44:44 2010 +0200
+++ b/ChangeLog	Sat Oct 09 10:59:55 2010 -0700
@@ -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.
--- a/admin/ChangeLog	Sat Oct 09 17:44:44 2010 +0200
+++ b/admin/ChangeLog	Sat Oct 09 10:59:55 2010 -0700
@@ -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.
--- a/admin/admin.el	Sat Oct 09 17:44:44 2010 +0200
+++ b/admin/admin.el	Sat Oct 09 10:59:55 2010 -0700
@@ -70,6 +70,9 @@
 		       (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)
--- a/configure	Sat Oct 09 17:44:44 2010 +0200
+++ b/configure	Sat Oct 09 10:59:55 2010 -0700
@@ -15017,7 +15017,7 @@
 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 @@
     "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;;
--- a/configure.in	Sat Oct 09 17:44:44 2010 +0200
+++ b/configure.in	Sat Oct 09 10:59:55 2010 -0700
@@ -3771,8 +3771,7 @@
 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
--- a/doc/emacs/ChangeLog	Sat Oct 09 17:44:44 2010 +0200
+++ b/doc/emacs/ChangeLog	Sat Oct 09 10:59:55 2010 -0700
@@ -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.
--- a/doc/emacs/Makefile.in	Sat Oct 09 17:44:44 2010 +0200
+++ b/doc/emacs/Makefile.in	Sat Oct 09 10:59:55 2010 -0700
@@ -160,7 +160,6 @@
 	rm -f emacs-manual-${version}.tar*
 
 distclean: clean
-	rm -f emacsver.texi
 
 ## In the standalone tarfile, the clean rule runs this.
 infoclean:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/emacs/emacsver.texi	Sat Oct 09 10:59:55 2010 -0700
@@ -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
--- a/doc/emacs/emacsver.texi.in	Sat Oct 09 17:44:44 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-@set EMACSVER @version@