mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
uninstalled-env cleanups
* meta/uninstalled-env.in: Clean up setting of GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH.
This commit is contained in:
parent
875b58d240
commit
8c4e90fa89
1 changed files with 14 additions and 12 deletions
|
@ -48,20 +48,22 @@ top_builddir="@top_builddir_absolute@"
|
||||||
|
|
||||||
if [ x"$GUILE_LOAD_PATH" = x ]
|
if [ x"$GUILE_LOAD_PATH" = x ]
|
||||||
then
|
then
|
||||||
|
GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}:${top_srcdir}/guile-readline"
|
||||||
if test "${top_srcdir}" != "${top_builddir}"; then
|
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"
|
GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}:${top_builddir}/guile-readline"
|
||||||
else
|
|
||||||
GUILE_LOAD_PATH="${top_srcdir}/guile-readline:${top_srcdir}:${top_srcdir}/module:${top_srcdir}/module"
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
for d in "${top_srcdir}" "${top_srcdir}/guile-readline" \
|
for d in "/module" "" "/guile-readline"
|
||||||
"${top_srcdir}/module" "${top_builddir}/module"
|
|
||||||
do
|
do
|
||||||
# This hair prevents double inclusion.
|
# This hair prevents double inclusion.
|
||||||
# The ":" prevents prefix aliasing.
|
# The ":" prevents prefix aliasing.
|
||||||
case x"$GUILE_LOAD_PATH" in
|
case x"$GUILE_LOAD_PATH" in
|
||||||
x*${d}:*) ;;
|
x*${top_srcdir}${d}:*) ;;
|
||||||
*) GUILE_LOAD_PATH="${d}:$GUILE_LOAD_PATH" ;;
|
*) 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
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -69,16 +71,15 @@ export GUILE_LOAD_PATH
|
||||||
|
|
||||||
if [ x"$GUILE_LOAD_COMPILED_PATH" = x ]
|
if [ x"$GUILE_LOAD_COMPILED_PATH" = x ]
|
||||||
then
|
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
|
else
|
||||||
for d in "${top_builddir}" "${top_builddir}/guile-readline" \
|
for d in "/module" "" "/guile-readline"
|
||||||
"${top_builddir}/module"
|
|
||||||
do
|
do
|
||||||
# This hair prevents double inclusion.
|
# This hair prevents double inclusion.
|
||||||
# The ":" prevents prefix aliasing.
|
# The ":" prevents prefix aliasing.
|
||||||
case x"$GUILE_LOAD_COMPILED_PATH" in
|
case x"$GUILE_LOAD_COMPILED_PATH" in
|
||||||
x*${d}:*) ;;
|
x*${top_builddir}${d}:*) ;;
|
||||||
*) GUILE_LOAD_COMPILED_PATH="${d}:$GUILE_LOAD_COMPILED_PATH" ;;
|
*) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -89,6 +90,7 @@ if ( env | grep -v '^GUILE_SYSTEM_PATH=' > /dev/null ); then
|
||||||
GUILE_SYSTEM_PATH=
|
GUILE_SYSTEM_PATH=
|
||||||
export GUILE_SYSTEM_PATH
|
export GUILE_SYSTEM_PATH
|
||||||
fi
|
fi
|
||||||
|
# Don't look in installed dirs for compiled guile modules
|
||||||
if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then
|
if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then
|
||||||
GUILE_SYSTEM_COMPILED_PATH=
|
GUILE_SYSTEM_COMPILED_PATH=
|
||||||
export GUILE_SYSTEM_COMPILED_PATH
|
export GUILE_SYSTEM_COMPILED_PATH
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue