HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge trunk
[bpt/emacs.git]
/
admin
/
quick-install-emacs
diff --git
a/admin/quick-install-emacs
b/admin/quick-install-emacs
index
1736b9c
..
f29d1cb
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
#!/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, 2012
-## Free Software Foundation, Inc.
+## Copyright (C) 2001-2014 Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>
## Author: Miles Bader <miles@gnu.org>
@@
-28,10
+27,10
@@
## install emacs very often. See the --help output for more details.
## install emacs very often. See the --help output for more details.
-PUBLIC_LIBSRC_BINARIES='
b2m
emacsclient etags ctags ebrowse'
-PUBLIC_LIBSRC_SCRIPTS='grep-changelog
rcs-checkin
'
+PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
+PUBLIC_LIBSRC_SCRIPTS='grep-changelog'
-AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile
makefile
stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
+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"
# Prune old binaries lying around in the source tree
PRUNE=no
# Prune old binaries lying around in the source tree
PRUNE=no
@@
-50,7
+49,7
@@
COPY='cp -f'
REMOVE='rm -r'
MKDIR='mkdir -p'
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
EXEC='sh'
NAWK=/usr/bin/nawk
@@
-106,8
+105,8
@@
and build directories reside.
Optionally, $me can also remove old versions of
automatically generated files that are version-specific (such as the
Optionally, $me can also remove old versions of
automatically generated files that are version-specific (such as the
-versioned emacs executables in the \`src' directory
, and the DOC-* files
-
in the \`etc' directory).
The latter action is called \`pruning,' and
+versioned emacs executables in the \`src' directory
).
+The latter action is called \`pruning,' and
can be enabled using the \`-p' or \`--prune' options.
EOF
exit 0
can be enabled using the \`-p' or \`--prune' options.
EOF
exit 0
@@
-120,7
+119,7
@@
Written by Miles Bader <miles@gnu.org>
EOF
exit 0
;;
EOF
exit 0
;;
- -[
^
-]?*)
+ -[
!
-]?*)
# split concatenated single-letter options apart
FIRST="$1"; shift
set -- `echo $FIRST | sed 's/-\(.\)\(.*\)/-\1 -\2/'` "$@"
# split concatenated single-letter options apart
FIRST="$1"; shift
set -- `echo $FIRST | sed 's/-\(.\)\(.*\)/-\1 -\2/'` "$@"
@@
-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 ; }
test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; }
test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; }
-VERSION=`grep 'defconst[ ]*emacs-version' $SRC/lisp/version.el \
- | 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"
DST_SHARE="$prefix/share/emacs/$VERSION"
DST_BIN="$prefix/bin"
@@
-208,10
+209,6
@@
maybe_mkdir "$DST_INFO"
PRUNED=""
if test x"$PRUNE" != xno; then
PRUNED=""
if test x"$PRUNE" != xno; then
- for D in `ls -1t $BUILD/etc/DOC-* | sed 1d`; do
- echo $REMOVE_CMD $D
- PRUNED="$PRUNED $D"
- done
for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do
echo $REMOVE_CMD $D
PRUNED="$PRUNED $D"
for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do
echo $REMOVE_CMD $D
PRUNED="$PRUNED $D"
@@
-374,5
+371,3
@@
END {
done
) | eval $EXEC
done
) | eval $EXEC
-
-# arch-tag: 9322b572-9755-4cf7-a67a-21e6505f1477