From 3c98a49cbdbb36065b23f5a03c695d720d30556f Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 15 Dec 2009 10:49:22 +0100 Subject: [PATCH] in the load path, look in library-dir before site-dir * libguile/load.c (scm_init_load_path): Search first in Guile's version-specific path (the library path), *then* in the site dir. This should allow us to import some of Guile-lib's modules into Guile, perhaps customizing them with Guile-version-specific foo, without accidentally falling back to system-installed guile-lib in the sitedir. Also should reduce the number of stats by half, in the common case. --- libguile/load.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libguile/load.c b/libguile/load.c index 83fb35340..dbe80f62c 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -239,8 +239,8 @@ scm_init_load_path () 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), + path = scm_list_3 (scm_from_locale_string (SCM_LIBRARY_DIR), + scm_from_locale_string (SCM_SITE_DIR), scm_from_locale_string (SCM_PKGDATA_DIR)); env = getenv ("GUILE_SYSTEM_COMPILED_PATH"); -- 2.20.1