diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-06-10 17:13:06 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-06-10 17:13:06 +0200 |
| commit | 8c4e90fa899c97c235c9af908eeca49e6fd4a151 (patch) | |
| tree | 983a97d585ee99c69d5b881af2d1ca1ccbbd0fef /meta | |
| parent | 875b58d240bc01eecb8c95581af2d8c94ecf19aa (diff) | |
| download | guile-8c4e90fa899c97c235c9af908eeca49e6fd4a151.tar.gz | |
uninstalled-env cleanups
* meta/uninstalled-env.in: Clean up setting of GUILE_LOAD_PATH and
GUILE_LOAD_COMPILED_PATH.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/uninstalled-env.in | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index b6e9c6403..987810bf9 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -48,20 +48,22 @@ top_builddir="@top_builddir_absolute@" if [ x"$GUILE_LOAD_PATH" = x ] then + GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}:${top_srcdir}/guile-readline" if test "${top_srcdir}" != "${top_builddir}"; then - GUILE_LOAD_PATH="${top_builddir}/guile-readline:${top_srcdir}/guile-readline:${top_builddir}:${top_srcdir}:${top_builddir}/module:${top_srcdir}/module" - else - GUILE_LOAD_PATH="${top_srcdir}/guile-readline:${top_srcdir}:${top_srcdir}/module:${top_srcdir}/module" + GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline" fi else - for d in "${top_srcdir}" "${top_srcdir}/guile-readline" \ - "${top_srcdir}/module" "${top_builddir}/module" + for d in "/module" "" "/guile-readline" do # This hair prevents double inclusion. # The ":" prevents prefix aliasing. case x"$GUILE_LOAD_PATH" in - x*${d}:*) ;; - *) GUILE_LOAD_PATH="${d}:$GUILE_LOAD_PATH" ;; + x*${top_srcdir}${d}:*) ;; + *) GUILE_LOAD_PATH="${top_srcdir}${d}:$GUILE_LOAD_PATH" ;; + esac + case x"$GUILE_LOAD_PATH" in + x*${top_builddir}${d}:*) ;; + *) GUILE_LOAD_PATH="${top_builddir}${d}:$GUILE_LOAD_PATH" ;; esac done fi @@ -69,16 +71,15 @@ 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" + GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline" else - for d in "${top_builddir}" "${top_builddir}/guile-readline" \ - "${top_builddir}/module" + for d in "/module" "" "/guile-readline" 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" ;; + x*${top_builddir}${d}:*) ;; + *) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;; esac done fi @@ -89,6 +90,7 @@ if ( env | grep -v '^GUILE_SYSTEM_PATH=' > /dev/null ); then GUILE_SYSTEM_PATH= export GUILE_SYSTEM_PATH fi +# Don't look in installed dirs for compiled guile modules if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then GUILE_SYSTEM_COMPILED_PATH= export GUILE_SYSTEM_COMPILED_PATH |