mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

GUILE_INSTALL_LOCALE=1 during build

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2013-03-07 11:02:33 +01:00
parent 7f893030ab
commit 83dce818ec
7 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
am/guilec
View file

@ -26,7 +26,7 @@ AM_V_GUILEC_0 = @echo " GUILEC" $@;
SUFFIXES = .scm .go SUFFIXES = .scm .go
.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 \ $(top_builddir)/meta/uninstalled-env \
guild compile --target="$(host)" $(GUILE_WARNINGS) \ guild compile --target="$(host)" $(GUILE_WARNINGS) \
-L "$(abs_srcdir)" -L "$(abs_builddir)" \ -L "$(abs_srcdir)" -L "$(abs_builddir)" \

3
doc/ref/Makefile.am
View file

@ -118,7 +118,8 @@ EXTRA_DIST = ChangeLog-2008 $(PICTURES)
libguile-autoconf.texi: autoconf-macros.texi libguile-autoconf.texi: autoconf-macros.texi
autoconf-macros.texi: $(top_srcdir)/meta/guile.m4 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 \ snarf-guile-m4-docs $(top_srcdir)/meta/guile.m4 \
> $(srcdir)/$@ > $(srcdir)/$@

3
libguile/Makefile.am
View file

@ -703,7 +703,8 @@ load.x: libpath.h
dynl.x: libpath.h dynl.x: libpath.h
alldotdocfiles = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) 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) dotdoc2texi = cat $(alldotdocfiles) | $(snarf2checkedtexi)
guile.texi: $(alldotdocfiles) guile$(EXEEXT) guile.texi: $(alldotdocfiles) guile$(EXEEXT)

5
module/Makefile.am
View file

@ -80,14 +80,15 @@ ETAGS_ARGS += \
ice-9/ChangeLog-2008 ice-9/ChangeLog-2008
ice-9/psyntax-pp.scm.gen: 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 $(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
.PHONY: ice-9/psyntax-pp.scm.gen .PHONY: ice-9/psyntax-pp.scm.gen
# Keep this rule in sync with that in `am/guilec'. # Keep this rule in sync with that in `am/guilec'.
ice-9/psyntax-pp.go: ice-9/psyntax.scm ice-9/psyntax-pp.scm 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 \ $(top_builddir)/meta/uninstalled-env \
guild compile --target="$(host)" $(GUILE_WARNINGS) \ guild compile --target="$(host)" $(GUILE_WARNINGS) \
-L "$(abs_srcdir)" -L "$(abs_builddir)" \ -L "$(abs_srcdir)" -L "$(abs_builddir)" \

4
test-suite/Makefile.am
View file

@ -214,7 +214,9 @@ LALR_EXTRA += \
TESTS = $(LALR_TESTS) TESTS = $(LALR_TESTS)
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
GUILE_INSTALL_LOCALE=1 \
GUILE_AUTO_COMPILE=0 \
@LOCALCHARSET_TESTS_ENVIRONMENT@ \ @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 EXTRA_DIST += $(LALR_EXTRA) $(LALR_TESTS) tests/sxml-match-tests.ss

4
test-suite/standalone/Makefile.am
View file

@ -35,9 +35,9 @@ TESTS_ENVIRONMENT = \
srcdir="$(srcdir)" \ srcdir="$(srcdir)" \
builddir="$(builddir)" \ builddir="$(builddir)" \
@LOCALCHARSET_TESTS_ENVIRONMENT@ \ @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. ## may point us to an old, installed version of guile.
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_builddir)/lib

3
test-suite/vm/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in. ## 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. ## This file is part of GUILE.
## ##
@ -20,6 +20,7 @@
## Fifth Floor, Boston, MA 02110-1301 USA ## Fifth Floor, Boston, MA 02110-1301 USA
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
GUILE_INSTALL_LOCALE=1 \
$(top_builddir)/meta/guile \ $(top_builddir)/meta/guile \
-l $(srcdir)/run-vm-tests.scm -e run-vm-tests -l $(srcdir)/run-vm-tests.scm -e run-vm-tests