diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 7 | ||||
| -rw-r--r-- | admin/admin.el | 3 | ||||
| -rwxr-xr-x | admin/quick-install-emacs | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 04fcf732bd9..6f2ac5d67d5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,10 @@ +2011-01-31 Paul Eggert <eggert@cs.ucla.edu> + + src/emacs.c now gets version number from configure.in + * admin.el (set-version): Don't update src/emacs.c. + * quick-install-emacs (VERSION): Get it from configure.in, not from + src/emacs.c. + 2011-01-30 Paul Eggert <eggert@cs.ucla.edu> strftime: import from gnulib diff --git a/admin/admin.el b/admin/admin.el index 5365cc77d24..739c769b352 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -59,9 +59,6 @@ Root must be the root of an Emacs source tree." (interactive "DEmacs root directory: \nsVersion number: ") (unless (file-exists-p (expand-file-name "src/emacs.c" root)) (error "%s doesn't seem to be the root of an Emacs source tree" root)) - (set-version-in-file root "src/emacs.c" version - (rx (and "emacs_version" (0+ (not (in ?\"))) - ?\" (submatch (1+ (not (in ?\")))) ?\"))) (set-version-in-file root "README" version (rx (and "version" (1+ space) (submatch (1+ (in "0-9.")))))) diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 0711f8e4b43..841a895248e 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -170,8 +170,10 @@ test x"$SRC" = x && { SRC="`get_config_var srcdir`" || exit 4 ; } test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; } test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; } -VERSION=`grep 'char emacs_version' $SRC/src/emacs.c \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` +VERSION=` + sed -n 's/^AC_INIT(emacs,[ ]*\([^ )]*\).*/\1/p' <$SRC/configure.in +` || exit 4 +test -n "$VERSION" || { echo >&2 "$me: no version in configure.in"; exit 4; } DST_SHARE="$prefix/share/emacs/$VERSION" DST_BIN="$prefix/bin" |