Skip to content

Commit

Permalink
GUILE_INSTALL_LOCALE=1 during build
Browse files Browse the repository at this point in the history
* doc/ref/Makefile.am (autoconf-macros.texi):
* libguile/Makefile.am (snarf2checkedtexi):
* module/Makefile.am (ice-9/psyntax-pp.scm.gen, ice-9/psyntax-pp.go):
* test-suite/Makefile.am (GUILE_AUTO_COMPILE):
* test-suite/standalone/Makefile.am (GUILE_INSTALL_LOCALE):
* test-suite/vm/Makefile.am (TESTS_ENVIRONMENT):
* am/guilec (.scm.go): Set GUILE_INSTALL_LOCALE to 1 during the build.
  Fixes bug 12887.
  • Loading branch information
wingo committed Mar 7, 2013
1 parent 7f89303 commit 83dce81
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion am/guilec
Expand Up @@ -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)" \
Expand Down
3 changes: 2 additions & 1 deletion doc/ref/Makefile.am
Expand Up @@ -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)/$@

Expand Down
3 changes: 2 additions & 1 deletion libguile/Makefile.am
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions module/Makefile.am
Expand Up @@ -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)" \
Expand Down
4 changes: 3 additions & 1 deletion test-suite/Makefile.am
Expand Up @@ -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
4 changes: 2 additions & 2 deletions test-suite/standalone/Makefile.am
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion 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.
##
Expand All @@ -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

Expand Down

0 comments on commit 83dce81

Please sign in to comment.