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

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

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7422d12fb819df89e38c1e50741d49ca1c0d5d0a..299190bb2a7b8bc457df8c54b2e7b3bffa38d51d 100644 (file)
--- 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 c9e020546e55f22835fd0df81ea7c2c2c29e5cab..2b52a864aecfb4df9c87e0fd88e3460adba00958 100755 (executable)
--- 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 ()
 {