X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a3e44e793796153ff1534be9c74fcab50b45de30..b85f342318ce985fe277c5efda4824097abba855:/admin/quick-install-emacs diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 0e346cf538..e74a2a5af4 100755 --- 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, 2011 Free Software Foundation, Inc. +## Copyright (C) 2001-2013 Free Software Foundation, Inc. ## Author: Miles Bader @@ -29,7 +28,7 @@ PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse' -PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin' +PUBLIC_LIBSRC_SCRIPTS='grep-changelog' 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" @@ -50,7 +49,7 @@ COPY='cp -f' REMOVE='rm -r' MKDIR='mkdir -p' -# Used to execute commands once once we create them +# Used to execute commands once we create them EXEC='sh' NAWK=/usr/bin/nawk @@ -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.ac +` || exit 4 +test -n "$VERSION" || { echo >&2 "$me: no version in configure.ac"; exit 4; } DST_SHARE="$prefix/share/emacs/$VERSION" DST_BIN="$prefix/bin"