diff options
-rw-r--r-- | meta/uninstalled-env.in | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index d5c7949f5..b15237c4b 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -66,9 +66,26 @@ else fi export GUILE_LOAD_PATH +if [ x"$GUILE_LOAD_COMPILED_PATH" = x ] +then + GUILE_LOAD_COMPILED_PATH="${top_builddir}/guile-readline:${top_builddir}:${top_builddir}/module" +else + for d in "${top_builddir}" "${top_builddir}/guile-readline" \ + "${top_builddir}/module" + do + # This hair prevents double inclusion. + # The ":" prevents prefix aliasing. + case x"$GUILE_LOAD_COMPILED_PATH" in + x*${d}:*) ;; + *) GUILE_LOAD_COMPILED_PATH="${d}:$GUILE_LOAD_COMPILED_PATH" ;; + esac + done +fi +export GUILE_LOAD_COMPILED_PATH + # Don't look in installed dirs for guile modules -if ( env | grep -v -q -E '^GUILE_SYSTEM_PATH=' ); then - export GUILE_SYSTEM_PATH= +if ( env | grep -v -q -E '^GUILE_SYSTEM_COMPILED_PATH=' ); then + export GUILE_SYSTEM_COMPILED_PATH= fi # handle LTDL_LIBRARY_PATH (no clobber) |