[Emacs-diffs] /srv/bzr/emacs/trunk r101875: * configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.

[Glenn Morris]

------------------------------------------------------------
revno: 101875
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-09 10:59:55 -0700
message:
  * 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.
renamed:
  doc/emacs/emacsver.texi.in => doc/emacs/emacsver.texi
modified:
  .bzrignore
  ChangeLog
  admin/ChangeLog
  admin/admin.el
  configure
  configure.in
  doc/emacs/ChangeLog
  doc/emacs/Makefile.in
  doc/emacs/emacsver.texi

=== modified file '.bzrignore'
--- a/.bzrignore        2010-10-09 02:13:20 +0000
+++ b/.bzrignore        2010-10-09 17:59:55 +0000
@@ -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

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-10-09 02:16:38 +0000
+++ b/ChangeLog 2010-10-09 17:59:55 +0000
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <address@hidden>
 
+       * configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.
+
+2010-10-09  Glenn Morris  <address@hidden>
+
        * configure.in: Combine some conditionals.
 
        * configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2010-10-09 01:41:21 +0000
+++ b/admin/ChangeLog   2010-10-09 17:59:55 +0000
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <address@hidden>
 
+       * admin.el (set-version): Add doc/emacs/emacsver.texi.
+
+2010-10-09  Glenn Morris  <address@hidden>
+
        * admin.el (set-version): No need to act on doc/ files any more.
 
        * quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.

=== modified file 'admin/admin.el'
--- a/admin/admin.el    2010-10-09 01:41:21 +0000
+++ b/admin/admin.el    2010-10-09 17:59:55 +0000
@@ -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)

=== modified file 'configure'
--- a/configure 2010-10-09 01:59:50 +0000
+++ b/configure 2010-10-09 17:59:55 +0000
@@ -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;;

=== modified file 'configure.in'
--- a/configure.in      2010-10-09 02:16:38 +0000
+++ b/configure.in      2010-10-09 17:59:55 +0000
@@ -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

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-10-09 02:09:46 +0000
+++ b/doc/emacs/ChangeLog       2010-10-09 17:59:55 +0000
@@ -1,5 +1,10 @@
 2010-10-09  Glenn Morris  <address@hidden>
 
+       * Makefile.in (distclean): Do not delete emacsver.texi.
+       * emacsver.texi: New file, replacing emacsver.texi.in.
+
+2010-10-09  Glenn Morris  <address@hidden>
+
        * emacsver.texi.in: New file.
        * emacs.texi: Set EMACSVER by including emacsver.texi.
        * Makefile.in (distclean): Delete emacsver.texi.

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2010-10-09 02:09:46 +0000
+++ b/doc/emacs/Makefile.in     2010-10-09 17:59:55 +0000
@@ -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:

=== renamed file 'doc/emacs/emacsver.texi.in' => 'doc/emacs/emacsver.texi'
--- a/doc/emacs/emacsver.texi.in        2010-10-09 01:41:21 +0000
+++ b/doc/emacs/emacsver.texi   2010-10-09 17:59:55 +0000
@@ -1,1 +1,4 @@
address@hidden EMACSVER @version@
address@hidden It would be nicer to generate this using configure and 
@address@hidden
address@hidden However, that would mean emacsver.texi would always be newer
address@hidden then the info files in release tarfiles.
address@hidden EMACSVER 24.0.50