summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--am/guilec2
-rw-r--r--doc/ref/Makefile.am3
-rw-r--r--libguile/Makefile.am3
-rw-r--r--module/Makefile.am5
-rw-r--r--test-suite/Makefile.am4
-rw-r--r--test-suite/standalone/Makefile.am4
-rw-r--r--test-suite/vm/Makefile.am3
7 files changed, 15 insertions, 9 deletions
diff --git a/am/guilec b/am/guilec
index 7634a9716..f5849d079 100644
--- a/am/guilec
+++ b/am/guilec
@@ -26,7 +26,7 @@ AM_V_GUILEC_0 = @echo " GUILEC" $@;
SUFFIXES = .scm .go
.scm.go:
- $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \
+ $(AM_V_GUILEC)GUILE_INSTALL_LOCALE=1 GUILE_AUTO_COMPILE=0 \
$(top_builddir)/meta/uninstalled-env \
guild compile --target="$(host)" $(GUILE_WARNINGS) \
-L "$(abs_srcdir)" -L "$(abs_builddir)" \
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 260bb1448..4b1706e2b 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -118,7 +118,8 @@ EXTRA_DIST = ChangeLog-2008 $(PICTURES)
libguile-autoconf.texi: autoconf-macros.texi
autoconf-macros.texi: $(top_srcdir)/meta/guile.m4
- GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild \
+ GUILE_INSTALL_LOCALE=1 GUILE_AUTO_COMPILE=0 \
+ $(top_builddir)/meta/uninstalled-env guild \
snarf-guile-m4-docs $(top_srcdir)/meta/guile.m4 \
> $(srcdir)/$@
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 0a401206f..8df2f7c4a 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -703,7 +703,8 @@ load.x: libpath.h
dynl.x: libpath.h
alldotdocfiles = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
-snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi
+snarf2checkedtexi = GUILE_INSTALL_LOCALE=1 GUILE_AUTO_COMPILE=0 \
+ $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi
dotdoc2texi = cat $(alldotdocfiles) | $(snarf2checkedtexi)
guile.texi: $(alldotdocfiles) guile$(EXEEXT)
diff --git a/module/Makefile.am b/module/Makefile.am
index 79957c1b8..c47d0b476 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -80,14 +80,15 @@ ETAGS_ARGS += \
ice-9/ChangeLog-2008
ice-9/psyntax-pp.scm.gen:
- $(top_builddir_absolute)/meta/guile --no-auto-compile -s $(srcdir)/ice-9/compile-psyntax.scm \
+ GUILE_INSTALL_LOCALE=1 GUILE_AUTO_COMPILE=0 \
+ $(top_builddir_absolute)/meta/guile -s $(srcdir)/ice-9/compile-psyntax.scm \
$(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
.PHONY: ice-9/psyntax-pp.scm.gen
# Keep this rule in sync with that in `am/guilec'.
ice-9/psyntax-pp.go: ice-9/psyntax.scm ice-9/psyntax-pp.scm
- $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \
+ $(AM_V_GUILEC)GUILE_INSTALL_LOCALE=1 GUILE_AUTO_COMPILE=0 \
$(top_builddir)/meta/uninstalled-env \
guild compile --target="$(host)" $(GUILE_WARNINGS) \
-L "$(abs_srcdir)" -L "$(abs_builddir)" \
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 9fba7b8b3..e7c8c4177 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -214,7 +214,9 @@ LALR_EXTRA += \
TESTS = $(LALR_TESTS)
TESTS_ENVIRONMENT = \
+ GUILE_INSTALL_LOCALE=1 \
+ GUILE_AUTO_COMPILE=0 \
@LOCALCHARSET_TESTS_ENVIRONMENT@ \
- $(top_builddir)/meta/guile --no-auto-compile
+ $(top_builddir)/meta/guile
EXTRA_DIST += $(LALR_EXTRA) $(LALR_TESTS) tests/sxml-match-tests.ss
diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
index be5d91380..4b1c8227c 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -35,9 +35,9 @@ TESTS_ENVIRONMENT = \
srcdir="$(srcdir)" \
builddir="$(builddir)" \
@LOCALCHARSET_TESTS_ENVIRONMENT@ \
- GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env"
+ GUILE_INSTALL_LOCALE=1 GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env"
-## Check for headers in $(srcdir) and bulid dir before $(CPPFLAGS), which
+## Check for headers in $(srcdir) and build dir before $(CPPFLAGS), which
## may point us to an old, installed version of guile.
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/lib -I$(top_builddir)/lib
diff --git a/test-suite/vm/Makefile.am b/test-suite/vm/Makefile.am
index 0e6e974e2..2a3e38f87 100644
--- a/test-suite/vm/Makefile.am
+++ b/test-suite/vm/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in.
##
-## Copyright 2005, 2006, 2008, 2009, 2010 Software Foundation, Inc.
+## Copyright 2005, 2006, 2008, 2009, 2010, 2013 Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@ -20,6 +20,7 @@
## Fifth Floor, Boston, MA 02110-1301 USA
TESTS_ENVIRONMENT = \
+ GUILE_INSTALL_LOCALE=1 \
$(top_builddir)/meta/guile \
-l $(srcdir)/run-vm-tests.scm -e run-vm-tests