(exception:string-contains-nul): New exception pattern.

[bpt/guile.git] / pre-inst-guile.in

diff --git a/pre-inst-guile.in b/pre-inst-guile.in
index d5cbc1b..ea8e4b1 100644 (file)
--- a/pre-inst-guile.in
+++ b/pre-inst-guile.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      Copyright (C) 2002 Free Software Foundation
+#      Copyright (C) 2002, 2006 Free Software Foundation
 #
 #   This file is part of GUILE.
 #
@@ -16,8 +16,8 @@
 #
 #   You should have received a copy of the GNU General Public
 #   License along with GUILE; see the file COPYING.  If not, write
-#   to the Free Software Foundation, Inc., 59 Temple Place, Suite
-#   330, Boston, MA 02111-1307 USA
+#   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+#   Floor, Boston, MA 02110-1301 USA
 
 # NOTE: at some point we might consider invoking this under
 # pre-inst-guile-env.  If this will work, then most of the code below
@@ -58,14 +58,19 @@ top_builddir="@top_builddir_absolute@"
 }
 
 # handle GUILE_LOAD_PATH (no clobber)
-if [ x"$GUILE_LOAD_PATH" = x ] ; then
-    GUILE_LOAD_PATH="${top_srcdir}"
+if [ x"$GUILE_LOAD_PATH" = x ]
+then
+    GUILE_LOAD_PATH="${top_srcdir}/guile-readline:${top_srcdir}"
 else
+  for d in "${top_srcdir}" "${top_srcdir}/guile-readline"
+  do
     # This hair prevents double inclusion.
     # The ":" prevents prefix aliasing.
-    case x"$GUILE_LOAD_PATH" in x*${top_srcdir}:*) ;;
-      *) GUILE_LOAD_PATH="${top_srcdir}:$GUILE_LOAD_PATH" ;;
+    case x"$GUILE_LOAD_PATH" in
+      x*${d}:*) ;;
+      *) GUILE_LOAD_PATH="${d}:$GUILE_LOAD_PATH" ;;
     esac
+  done
 fi
 export GUILE_LOAD_PATH