summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-03-31 23:33:00 +0200
committerAndy Wingo <wingo@pobox.com>2011-03-31 23:33:00 +0200
commit1c8a6308c0050189a777d9384f270aea3206c2e0 (patch)
treebc7fa29a3a20365423f741055d500c1fb7394d0c
parent987b8160f58185c50c4cf4703eb15f04f6cd9f89 (diff)
downloadguile-1c8a6308c0050189a777d9384f270aea3206c2e0.tar.gz
fix duplicate path in uninstalled-env
* meta/uninstalled-env.in: Our code that checked for paths already being in the load path was not working for the last entry in the load path. This caused the last entry to be re-added to the beginning, which also caused relative filename canonicalization to prepend "module/" to everything. Terrible.
-rw-r--r--meta/uninstalled-env.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index b3deed5ab..4faad641b 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -59,10 +59,12 @@ else
# The ":" prevents prefix aliasing.
case x"$GUILE_LOAD_PATH" in
x*${top_srcdir}${d}:*) ;;
+ x*${top_srcdir}${d}) ;;
*) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;;
esac
case x"$GUILE_LOAD_PATH" in
x*${top_builddir}${d}:*) ;;
+ x*${top_builddir}${d}) ;;
*) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;;
esac
done
@@ -79,6 +81,7 @@ else
# The ":" prevents prefix aliasing.
case x"$GUILE_LOAD_COMPILED_PATH" in
x*${top_builddir}${d}:*) ;;
+ x*${top_builddir}${d}) ;;
*) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
esac
done