wingo pushed a commit to branch master
in repository guile.
commit e264117e1b73cfbc70f863bb964653dd9ed7a83e
Author: Andy Wingo <[email protected]>
Date: Mon Jun 27 22:47:06 2016 +0200
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.
---
meta/uninstalled-env.in | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 7197eab..ff32902 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -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" ;;
