diff options
| author | Andy Wingo <wingo@pobox.com> | 2009-10-13 11:31:02 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2009-10-13 11:31:02 +0200 |
| commit | 28af5ee5eccb7797b73ad1caf88183e95eef0a28 (patch) | |
| tree | 31c9c7e26f3513c0d7581244322f0cd191c6e741 /meta/uninstalled-env.in | |
| parent | d71db1f9a984b8bbd5879bd09a98ac2444ea7eb2 (diff) | |
add $libir to the ltdl path, not $pkglibdir; add extensionsdir
* libguile/Makefile.am (libpath.h): Fix SCM_LIB_DIR to point to the
libdir, not pkglibdir. Add SCM_EXTENSIONS_DIR, for a dir to put in the
dynamic-link search path that's not managed by ldconfig or the like;
and put this dir in the "extensionsdir" key of %guile-build-info.
* libguile/dynl.c (sysdep_dynl_init): Rename the installed-libdir
environment var to GUILE_SYSTEM_EXTENSIONS_PATH (from
GUILE_SYSTEM_LTDL_PATH). Also add SCM_EXTENSIONS_DIR to the ltdl
search path in the default case.
* meta/uninstalled-env.in: Adapt override to match.
* meta/guile-2.0.pc.in: Add extensionsdir, so you can pkg-config
--variable=extensionsdir guile-2.0.
Diffstat (limited to 'meta/uninstalled-env.in')
| -rw-r--r-- | meta/uninstalled-env.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index 649d1fc47..58d50ca1b 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -89,8 +89,8 @@ if ( env | grep -v -q -E '^GUILE_SYSTEM_COMPILED_PATH=' ); then export GUILE_SYSTEM_COMPILED_PATH= fi # Don't look in installed dirs for dlopen-able modules -if ( env | grep -v -q -E '^GUILE_SYSTEM_LTDL_PATH=' ); then - export GUILE_SYSTEM_LTDL_PATH= +if ( env | grep -v -q -E '^GUILE_SYSTEM_EXTENSIONS_PATH=' ); then + export GUILE_SYSTEM_EXTENSIONS_PATH= fi # handle LTDL_LIBRARY_PATH (no clobber) |