mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

don't poke installed scm, go, etc files when running pre-inst-guile

Browse source 
* libguile/load.c (scm_init_load_path): If GUILE_SYSTEM_PATH is set, use
  that instead of the compiled-in suffix to the load path. And, as a
  special case, GUILE_SYSTEM_PATH= is interpreted as '(). A bit nasty.

* pre-inst-guile-env.in (top_builddir): Set GUILE_SYSTEM_PATH to the
  empty string, if it is not set.
This commit is contained in:
Andy Wingo 2008-09-18 23:04:58 +02:00
parent d51406fe87
commit 02b84691b2
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libguile/load.c
View file

@ -211,9 +211,17 @@ scm_init_load_path ()
SCM path = SCM_EOL; SCM path = SCM_EOL;
#ifdef SCM_LIBRARY_DIR #ifdef SCM_LIBRARY_DIR
path = scm_list_3 (scm_from_locale_string (SCM_SITE_DIR), env = getenv ("GUILE_SYSTEM_PATH");
scm_from_locale_string (SCM_LIBRARY_DIR), if (env && strcmp (env, "") == 0)
scm_from_locale_string (SCM_PKGDATA_DIR)); /* special-case interpret system-path=="" as meaning no system path instead
of '("") */
;
else if (env)
path = scm_parse_path (scm_from_locale_string (env), path);
else
path = scm_list_3 (scm_from_locale_string (SCM_SITE_DIR),
scm_from_locale_string (SCM_LIBRARY_DIR),
scm_from_locale_string (SCM_PKGDATA_DIR));
#endif /* SCM_LIBRARY_DIR */ #endif /* SCM_LIBRARY_DIR */
env = getenv ("GUILE_LOAD_PATH"); env = getenv ("GUILE_LOAD_PATH");

5
pre-inst-guile-env.in
View file

@ -66,6 +66,11 @@ else
fi fi
export GUILE_LOAD_PATH export GUILE_LOAD_PATH
# Don't look in installed dirs for guile modules
if ( env | grep -v -q -E '^GUILE_SYSTEM_PATH=' ); then
export GUILE_SYSTEM_PATH=
fi
# handle LTDL_LIBRARY_PATH (no clobber) # handle LTDL_LIBRARY_PATH (no clobber)
ltdl_prefix="" ltdl_prefix=""
dyld_prefix="" dyld_prefix=""