mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-21 04:00:19 +02:00
Code Activity

more uninstalled-env fixen

Browse source 
* meta/uninstalled-env.in: Don't implicitly add . to LTDL
  search paths if no LTDL_LIBRARY_PATH was set. Avoid a duplicate to
  PATH.
This commit is contained in:
Andy Wingo 2010-06-10 17:23:51 +02:00
parent 8c4e90fa89
commit 070d8db023
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
meta/uninstalled-env.in
View file

@ -102,15 +102,19 @@ if ( env | grep -v '^GUILE_SYSTEM_EXTENSIONS_PATH=' > /dev/null ); then
fi fi
# handle LTDL_LIBRARY_PATH (no clobber) # handle LTDL_LIBRARY_PATH (no clobber)
ltdl_prefix=""
dyld_prefix=""
for dir in $subdirs_with_ltlibs ; do for dir in $subdirs_with_ltlibs ; do
ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}" if test -z "$LTDL_LIBRARY_PATH"; then
dyld_prefix="${top_builddir}/${dir}/.libs:${dyld_prefix}" LTDL_LIBRARY_PATH="${top_builddir}/${dir}"
else
LTDL_LIBRARY_PATH="${top_builddir}/${dir}:${LTDL_LIBRARY_PATH}"
fi
if test -z "$DYLD_LIBRARY_PATH"; then
DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs"
else
DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs:${DYLD_LIBRARY_PATH}"
fi
done done
LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
export LTDL_LIBRARY_PATH export LTDL_LIBRARY_PATH
DYLD_LIBRARY_PATH="${dyld_prefix}$DYLD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH
if [ x"$PKG_CONFIG_PATH" = x ] if [ x"$PKG_CONFIG_PATH" = x ]
@ -124,7 +128,9 @@ export PKG_CONFIG_PATH
# handle PATH (no clobber) # handle PATH (no clobber)
PATH="${top_builddir}/libguile:${PATH}" PATH="${top_builddir}/libguile:${PATH}"
PATH="${top_srcdir}/meta:${PATH}" PATH="${top_srcdir}/meta:${PATH}"
PATH="${top_builddir}/meta:${PATH}" if "x${top_srcdir}" != "x${top_builddir}"; then
PATH="${top_builddir}/meta:${PATH}"
fi
export PATH export PATH
exec "$@" exec "$@"