changeset 102491:467e43a5edd5

quick-install-emacs: Be more clever about locating info directory Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1570
author Miles Bader <miles@gnu.org>
date Wed, 11 Mar 2009 23:50:45 +0000
parents 252fb69956fe
children b94fb0c6526f
files admin/ChangeLog admin/quick-install-emacs
diffstat 2 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/admin/ChangeLog	Wed Mar 11 23:47:21 2009 +0000
+++ b/admin/ChangeLog	Wed Mar 11 23:50:45 2009 +0000
@@ -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.
--- a/admin/quick-install-emacs	Wed Mar 11 23:47:21 2009 +0000
+++ b/admin/quick-install-emacs	Wed Mar 11 23:50:45 2009 +0000
@@ -176,7 +176,19 @@
 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 ()
 {