mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-05 15:10:27 +02:00
don't poke installed scm, go, etc files when running pre-inst-guile
* 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:
parent
d51406fe87
commit
02b84691b2
2 changed files with 16 additions and 3 deletions
|
@ -211,9 +211,17 @@ scm_init_load_path ()
|
|||
SCM path = SCM_EOL;
|
||||
|
||||
#ifdef SCM_LIBRARY_DIR
|
||||
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));
|
||||
env = getenv ("GUILE_SYSTEM_PATH");
|
||||
if (env && strcmp (env, "") == 0)
|
||||
/* 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 */
|
||||
|
||||
env = getenv ("GUILE_LOAD_PATH");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue