1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00

Fix uninstalled-env bug that put prebuilt/ in front

* meta/uninstalled-env.in (top_builddir): Fix bug whereby
  meta/uninstalled-env run within meta-uninstalled-env, as happens
  sometimes, would move the prebuilt dir to the front.
This commit is contained in:
Andy Wingo 2016-06-27 22:47:06 +02:00
parent ed39782c2a
commit e264117e1b

View file

@ -80,17 +80,12 @@ then
fi
export GUILE_LOAD_PATH
if test "x$GUILE_LOAD_COMPILED_PATH" = "x"; then
GUILE_LOAD_COMPILED_PATH="${top_srcdir}/prebuilt/@host@"
else
GUILE_LOAD_COMPILED_PATH="${top_srcdir}/prebuilt/@host@:$GUILE_LOAD_COMPILED_PATH"
fi
for d in "/bootstrap" "/module" "/guile-readline"
for d in "/prebuilt/@host@" "/bootstrap" "/module" "/guile-readline"
do
# This hair prevents double inclusion.
# The ":" prevents prefix aliasing.
case x"$GUILE_LOAD_COMPILED_PATH" in
x) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}" ;;
x*${top_builddir}${d}:*) ;;
x*${top_builddir}${d}) ;;
*) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;