procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2010-10-09 10:59:55 -07:00
parent 77aec22102
commit f4f358f172
9 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

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

4
admin/ChangeLog
View file

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

3
admin/admin.el
View file

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

3
configure vendored
View file

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

3
configure.in
View file

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

5
doc/emacs/ChangeLog
View file

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

1
doc/emacs/Makefile.in
View file

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

4
doc/emacs/emacsver.texi Normal file
View file

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

1
doc/emacs/emacsver.texi.in
View file

@ -1 +0,0 @@
@set EMACSVER @version@