summaryrefslogtreecommitdiff
path: root/admin/quick-install-emacs
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2009-03-11 23:50:45 +0000
committerMiles Bader <miles@gnu.org>2009-03-11 23:50:45 +0000
commit40c3f43443fc9fa6685d120f70a64bea71d0ff94 (patch)
tree841b66925a0085476b46de002715dc4726b4c6c0 /admin/quick-install-emacs
parentc11ffe1a4ca4bff00ae45dc848264b27f39a7f6c (diff)
downloademacs-40c3f43443fc9fa6685d120f70a64bea71d0ff94.tar.gz
quick-install-emacs: Be more clever about locating info directory
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1570
Diffstat (limited to 'admin/quick-install-emacs')
-rwxr-xr-xadmin/quick-install-emacs14
1 files changed, 13 insertions, 1 deletions
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index c9e020546e5..2b52a864aec 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -176,7 +176,19 @@ VERSION=`grep 'defconst[ ]*emacs-version' $SRC/lisp/version.el \
DST_SHARE="$prefix/share/emacs/$VERSION"
DST_BIN="$prefix/bin"
DST_LIBEXEC="$prefix/libexec/emacs/$VERSION/$ARCH"
-DST_INFO="$prefix/info"
+
+# There are various common places for the info dir to be, so try to
+# use whatever's already there, defaulting to (and preferring)
+# .../share/info.
+#
+DST_INFO=''
+for D in "$prefix/share/info" "$prefix/info"; do
+ if test -d "$D"; then
+ DST_INFO="$D"
+ break
+ fi
+done
+DST_INFO=${DST_INFO:-"$prefix/share/info"}
maybe_mkdir ()
{