Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.

[gnu-emacs] / admin / quick-install-emacs

diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 39b200b510261aa7247920876d9eefce1a7f5604..841a895248e2f53c0e47c7a0a5f79f4656be4b11 100755 (executable)
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,8 +1,7 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-##   2010  Free Software Foundation, Inc.
+## Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
@@ -28,7 +27,7 @@
 ## install emacs very often.  See the --help output for more details.
 
 
-PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse'
+PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
 PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
 
 AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
@@ -171,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"
@@ -374,5 +375,3 @@ END {
 done
 
 ) | eval $EXEC
-
-# arch-tag: 9322b572-9755-4cf7-a67a-21e6505f1477