quick-install-emacs: Be more clever about locating info directory

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1570

2 files changed, 17 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7422d12fb81..299190bb2a7 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-11  Miles Bader  <Miles Bader <miles@gnu.org>>
+
+        * quick-install-emacs: Be more clever about locating info directory.
+
 2009-02-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * nt/README.W32: Fix typos.
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 ()
 {