[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/admin ChangeLog quick-install-emacs
From: |
Miles Bader |
Subject: |
[Emacs-diffs] emacs/admin ChangeLog quick-install-emacs |
Date: |
Wed, 11 Mar 2009 23:50:45 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 09/03/11 23:50:45
Modified files:
admin : ChangeLog quick-install-emacs
Log message:
quick-install-emacs: Be more clever about locating info directory
Revision: address@hidden/emacs--devo--0--patch-1570
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/admin/ChangeLog?cvsroot=emacs&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/emacs/admin/quick-install-emacs?cvsroot=emacs&r1=1.19&r2=1.20
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/admin/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- ChangeLog 24 Feb 2009 11:50:34 -0000 1.175
+++ ChangeLog 11 Mar 2009 23:50:45 -0000 1.176
@@ -1,3 +1,7 @@
+2009-03-11 Miles Bader <Miles Bader <address@hidden>>
+
+ * quick-install-emacs: Be more clever about locating info directory.
+
2009-02-24 Juanma Barranquero <address@hidden>
* nt/README.W32: Fix typos.
Index: quick-install-emacs
===================================================================
RCS file: /cvsroot/emacs/emacs/admin/quick-install-emacs,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- quick-install-emacs 8 Jan 2009 04:24:43 -0000 1.19
+++ quick-install-emacs 11 Mar 2009 23:50:45 -0000 1.20
@@ -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 ()
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/admin ChangeLog quick-install-emacs,
Miles Bader <=