diff options
-rw-r--r-- | libguile/Makefile.am | 1 | ||||
-rw-r--r-- | libguile/load.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am index e69a1551e..1817100fd 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -647,6 +647,7 @@ libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status @echo '#define SCM_LIB_DIR "$(libdir)"' >> libpath.tmp @echo '#define SCM_EXTENSIONS_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp @echo '#define SCM_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp + @echo '#define SCM_SITE_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache"' >> libpath.tmp @echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> libpath.tmp @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp diff --git a/libguile/load.c b/libguile/load.c index 91309bb1e..de6bf7c60 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -270,7 +270,10 @@ scm_init_load_path () else if (env) cpath = scm_parse_path (scm_from_locale_string (env), cpath); else - cpath = scm_cons (scm_from_locale_string (SCM_CCACHE_DIR), cpath); + { + cpath = scm_list_2 (scm_from_locale_string (SCM_CCACHE_DIR), + scm_from_locale_string (SCM_SITE_CCACHE_DIR)); + } #endif /* SCM_LIBRARY_DIR */ |