From f4f358f172feadc4c706e540f17e0989c2e1c9b8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 9 Oct 2010 10:59:55 -0700 Subject: [PATCH] * 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 | 4 ++++ admin/ChangeLog | 4 ++++ admin/admin.el | 3 +++ configure | 3 +-- configure.in | 3 +-- doc/emacs/ChangeLog | 5 +++++ doc/emacs/Makefile.in | 1 - doc/emacs/emacsver.texi | 4 ++++ doc/emacs/emacsver.texi.in | 1 - 9 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 doc/emacs/emacsver.texi delete mode 100644 doc/emacs/emacsver.texi.in diff --git a/ChangeLog b/ChangeLog index 0849a25a2f..30f7e9e2f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-10-09 Glenn Morris + + * configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi. + 2010-10-09 Glenn Morris * configure.in: Combine some conditionals. diff --git a/admin/ChangeLog b/admin/ChangeLog index dc220d9974..b2a416f946 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2010-10-09 Glenn Morris + + * admin.el (set-version): Add doc/emacs/emacsver.texi. + 2010-10-09 Glenn Morris * admin.el (set-version): No need to act on doc/ files any more. diff --git a/admin/admin.el b/admin/admin.el index 02b2ffac91..7cd2c02fb5 100644 --- 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 79b719539d..144d6dff5c 100755 --- 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 6bf599b96b..51d7012128 100644 --- 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 9eecf44abd..468a789c1d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2010-10-09 Glenn Morris + + * Makefile.in (distclean): Do not delete emacsver.texi. + * emacsver.texi: New file, replacing emacsver.texi.in. + 2010-10-09 Glenn Morris * emacsver.texi.in: New file. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index d877a92f93..c50878ff53 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 0000000000..ffa860585b --- /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 d6ad0e8da0..0000000000 --- a/doc/emacs/emacsver.texi.in +++ /dev/null @@ -1 +0,0 @@ -@set EMACSVER @version@ -- 2.20.1