*** empty log message ***

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

diff --git a/pre-inst-guile.in b/pre-inst-guile.in
index 149fbd3..5c47b34 100644 (file)
--- a/pre-inst-guile.in
+++ b/pre-inst-guile.in
@@ -16,8 +16,15 @@
 #
 #   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
+# can be removed.
+
+# NOTE: If you update this file, please update pre-inst-guile-env.in
+# as well, if appropriate.
 
 # Commentary:
 
@@ -39,7 +46,7 @@
 subdirs_with_ltlibs="srfi guile-readline"       # maintain me
 
 # env (set by configure)
-top_srcdir=`(cd "@top_srcdir@" ; pwd)`
+top_srcdir="@top_srcdir_absolute@"
 top_builddir="@top_builddir_absolute@"
 
 [ x"$top_srcdir"   = x -o ! -d "$top_srcdir" -o \
@@ -51,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