[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.2-16-g995764
From: |
Andy Wingo |
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.2-16-g9957641 |
Date: |
Thu, 21 Jul 2011 15:24:58 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=9957641b603f79b070fc2be0bf511235fa764229
The branch, stable-2.0 has been updated
via 9957641b603f79b070fc2be0bf511235fa764229 (commit)
from 072624134b9d8b2aa37f619dc5f828d667c72737 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9957641b603f79b070fc2be0bf511235fa764229
Author: Andy Wingo <address@hidden>
Date: Thu Jul 21 10:36:13 2011 +0200
add a site dir to %load-compiled-path
* libguile/Makefile.am (libpath.h): Define SCM_SITE_CCACHE_DIR. Defined
as site-ccache/ instead of site/ccache/ to indicate that we don't expect
further subdirectories, and also to avoid confusion about whether
extensions/ is a site-specific or not.
* libguile/load.c (scm_init_load_path): Add SCM_SITE_CCACHE_DIR to the
default load-compiled path.
-----------------------------------------------------------------------
Summary of changes:
libguile/Makefile.am | 1 +
libguile/load.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index e69a155..1817100 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 91309bb..de6bf7c 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 */
hooks/post-receive
--
GNU Guile
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.2-16-g9957641,
Andy Wingo <=