Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT, per

https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html
Means explicitly exporting all variables, unfortunately.
(EXTRA_DIST): correct Tlpatches typo to TLpatches.


git-svn-id: svn://tug.org/texlive/trunk@43617 c570f23f-e606-0410-a88d-b1316a301751

28 files changed, 111 insertions, 56 deletions

diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog
index 44605686473..cb55112e3fd 100644
--- a/Build/source/texk/chktex/ChangeLog
+++ b/Build/source/texk/chktex/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-09-15  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Import ChkTeX 1.7.6.
diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am
index 4ec9036551a..5f95522b897 100644
--- a/Build/source/texk/chktex/Makefile.am
+++ b/Build/source/texk/chktex/Makefile.am
@@ -10,7 +10,7 @@
 #  Adapted for TeX Live from chktex/Makefile.in
 #
 #************************************************************************
-##
+
 ## We want to re-distribute the whole original chktex source tree.
 ##
 ## With current automake (1.10.2) 'make distcheck' fails when
@@ -19,7 +19,6 @@
 EXTRA_DIST = $(CHKTEX_TREE)
 
 ## Patches applied to the original source tree
-##
 EXTRA_DIST += TLpatches
 
 # Files not to be distributed
@@ -119,11 +118,10 @@ CLEANFILES = $(nodist_bin_SCRIPTS) ChkTeX.aux ChkTeX.dvi ChkTeX.log ChkTeX.ps st
 @KPATHSEA_RULE@
 
 ## Tests
-##
 TESTS = chktex.test
 chktex.log: chktex$(EXEEXT)
 EXTRA_DIST += $(TESTS)
-TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE) TEXMFCNF=$(abs_srcdir)/../kpathsea
+AM_TESTS_ENVIRONMENT  = CHKTEX_TREE=$(CHKTEX_TREE); export CHKTEX_TREE;
+AM_TESTS_ENVIRONMENT += TEXMFCNF=$(abs_srcdir)/../kpathsea; export TEXMFCNF;
 
 CLEANFILES += chktest
-
diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in
index 7a49897f2d4..ae56d241240 100644
--- a/Build/source/texk/chktex/Makefile.in
+++ b/Build/source/texk/chktex/Makefile.in
@@ -14,6 +14,12 @@
 
 @SET_MAKE@
 
+#************************************************************************
+#
+#  Adapted for TeX Live from chktex/Makefile.in
+#
+#************************************************************************
+
 
 
 VPATH = @srcdir@
@@ -577,12 +583,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#************************************************************************
-#
-#  Adapted for TeX Live from chktex/Makefile.in
-#
-#************************************************************************
 EXTRA_DIST = $(CHKTEX_TREE) TLpatches regex/COPYING.LIB regex/README \
 	$(top_builddir)/../../build-aux/relpath ChkTeX.pdf ChkTeX.tex \
 	$(TESTS)
@@ -636,7 +636,8 @@ pdfdoc_DATA = ChkTeX.pdf
 CLEANFILES = $(nodist_bin_SCRIPTS) ChkTeX.aux ChkTeX.dvi ChkTeX.log \
 	ChkTeX.ps stamp-ChkTeX chktest
 TESTS = chktex.test
-TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE) TEXMFCNF=$(abs_srcdir)/../kpathsea
+AM_TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE); export CHKTEX_TREE; \
+	TEXMFCNF=$(abs_srcdir)/../kpathsea; export TEXMFCNF;
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 54012367a0e..7d9e800d312 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-04-03  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* Delete the directory dvi2tty-PATCHES/ because upstream
diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am
index d55aa023382..8ba5a1656e2 100644
--- a/Build/source/texk/dvi2tty/Makefile.am
+++ b/Build/source/texk/dvi2tty/Makefile.am
@@ -53,7 +53,7 @@ TESTS = disdvi.test dvi2tty.test
 disdvi.log: disdvi$(EXEXET)
 dvi2tty.log: dvi2tty$(EXEEXT)
 
-TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE)
+AM_TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE); export DVI2TTY_TREE;
 EXTRA_DIST += $(TESTS)
 
 ## disdvi.test
@@ -64,4 +64,3 @@ EXTRA_DIST += ligtest.tty test.tty testc.tty tests.tty testu.tty
 DISTCLEANFILES += ligtest.out test.out testc.out tests.out testu.out
 DISTCLEANFILES += table.out tablec.out tables.out tableu.out tableuC.out
 DISTCLEANFILES += tableEu.out tableEu1.out tableEuC.out tableEua.out
-
diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in
index 021d7782ea9..348f61ca595 100644
--- a/Build/source/texk/dvi2tty/Makefile.in
+++ b/Build/source/texk/dvi2tty/Makefile.in
@@ -581,7 +581,7 @@ man1_MANS = \
 	$(DVI2TTY_TREE)/dvi2tty.1
 
 TESTS = disdvi.test dvi2tty.test
-TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE)
+AM_TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE); export DVI2TTY_TREE;
 DISTCLEANFILES = ligtest.dout ligtest.out test.out testc.out tests.out \
 	testu.out table.out tablec.out tables.out tableu.out \
 	tableuC.out tableEu.out tableEu1.out tableEuC.out tableEua.out
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 1f435caaea2..919f35ae8a3 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2017-03-21  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* dvips.c: Show information and exit if dvips finds options
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index 8dd2eb1027e..e7229b85b3e 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -1,6 +1,8 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/dvipsk/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2017      Karl Berry <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 SUBDIRS = squeeze
@@ -115,11 +117,11 @@ TESTS += beginfontk1.test eepic-nan.test pfbincl.test \
 beginfontk1.log eepic-nan.log pfbincl.log \
 	quotecmd-test.log same-name.log test-dvips.log: dvips$(EXEEXT)
 
-TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea
-TESTS_ENVIRONMENT += TEXCONFIG=$(srcdir)/testdata
-TESTS_ENVIRONMENT += TEXFONTS=$(srcdir)/testdata
-TESTS_ENVIRONMENT += TEXFONTMAPS=$(srcdir)/testdata
-TESTS_ENVIRONMENT += TEXPSHEADERS=$(srcdir)/testdata
+AM_TESTS_ENVIRONMENT  = TEXMFCNF=$(srcdir)/../kpathsea; export TEXMFCNF;
+AM_TESTS_ENVIRONMENT += TEXCONFIG=$(srcdir)/testdata; export TEXCONFIG;
+AM_TESTS_ENVIRONMENT += TEXFONTS=$(srcdir)/testdata; export TEXFONTS;
+AM_TESTS_ENVIRONMENT += TEXFONTMAPS=$(srcdir)/testdata; export TEXFONTMAPS;
+AM_TESTS_ENVIRONMENT += TEXPSHEADERS=$(srcdir)/testdata; export TEXPSHEADERS;
 
 EXTRA_DIST += \
 	$(TESTS) \
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index f0e4b105b48..d7114690c19 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -738,9 +738,11 @@ CLEANFILES = $(prologues) texc.lpro
 TEST_EXTENSIONS = .pl .test
 TESTS = afm2tfm-test.pl beginfontk1.test eepic-nan.test pfbincl.test \
 	quotecmd-test.pl same-name.test test-dvips.test
-TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea \
-	TEXCONFIG=$(srcdir)/testdata TEXFONTS=$(srcdir)/testdata \
-	TEXFONTMAPS=$(srcdir)/testdata TEXPSHEADERS=$(srcdir)/testdata
+AM_TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea; export \
+	TEXMFCNF; TEXCONFIG=$(srcdir)/testdata; export TEXCONFIG; \
+	TEXFONTS=$(srcdir)/testdata; export TEXFONTS; \
+	TEXFONTMAPS=$(srcdir)/testdata; export TEXFONTMAPS; \
+	TEXPSHEADERS=$(srcdir)/testdata; export TEXPSHEADERS;
 NEVER_DIST = `find . $(NEVER_NAMES)`
 NEVER_NAMES = -name .svn
 NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index 3b81fce7c12..17b47fe233c 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 43208 2017-02-13 17:57:19Z karl $
+# $Id: Makefile.am 43567 2017-03-21 17:43:10Z karl $
 # Makefile.am for the TeX Live subdirectory texk/dvisvgm/
 #
 # Copyright 2015-2017 Karl Berry <tex-live@tug.org>
diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog
index 7220feaea9d..481ef272b57 100644
--- a/Build/source/texk/gregorio/ChangeLog
+++ b/Build/source/texk/gregorio/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-09-29  Karl Berry  <karl@tug.org>
 
 	* configure.ac (FILENAME_VERSION): no need to define for TL.
diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am
index e45e82a2f24..1de6788f0e4 100644
--- a/Build/source/texk/gregorio/Makefile.am
+++ b/Build/source/texk/gregorio/Makefile.am
@@ -55,9 +55,9 @@ $(gregorio_OBJECTS): $(KPATHSEA_DEPEND)
 @KPATHSEA_RULE@
 
 ## TESTS
-##
-TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'
+AM_TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'; export GREGORIO_TREE;
 TESTS = gregorio.test
 gregorio.log: gregorio$(EXEEXT)
+
 EXTRA_DIST += $(TESTS)
 DISTCLEANFILES = factus.gtex veni.gtex
diff --git a/Build/source/texk/gregorio/Makefile.in b/Build/source/texk/gregorio/Makefile.in
index 8ca00d24aa3..7d11a596936 100644
--- a/Build/source/texk/gregorio/Makefile.in
+++ b/Build/source/texk/gregorio/Makefile.in
@@ -599,7 +599,7 @@ gregorio_SOURCES = \
 	@GREGORIO_TREE@/src/vowel/vowel-rules-y.c
 
 LDADD = $(KPATHSEA_LIBS)
-TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'
+AM_TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'; export GREGORIO_TREE;
 TESTS = gregorio.test
 DISTCLEANFILES = factus.gtex veni.gtex
 all: config_.h
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 0e6d823feef..724bc342f54 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2017-03-18  Karl Berry  <karl@tug.org>
 
 	* version.ac,
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index e72ca29407e..67b4541d425 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -4,7 +4,7 @@
 ## Copyright 2017 Karl Berry <tex-live@tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 SUBDIRS = . doc man
 
 EXTRA_DIST = PROJECTS
@@ -303,14 +303,18 @@ install-exec-hook: install-bin-links
 
 uninstall-hook: uninstall-bin-links
 
-## The tests
+## Tests
+AM_TESTS_ENVIRONMENT  = LN_S='$(LN_S)'; export LN_S;
+AM_TESTS_ENVIRONMENT += LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
+#
 TESTS  = tests/cnfnewline.test tests/kpseaccess.test
 TESTS += tests/kpsereadlink.test tests/kpsestat.test tests/kpsewhich.test
-TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
+#
 tests/cnfnewline.log tests/kpsewhich.log: kpsewhich$(EXEEXT)
 tests/kpseaccess.log: kpseaccess$(EXEEXT)
 tests/kpsereadlink.log: kpsereadlink$(EXEEXT)
 tests/kpsestat.log: kpsestat$(EXEEXT)
+#
 EXTRA_DIST += $(TESTS)
 EXTRA_DIST += tests/cnfnewline/texmf.cnf
 
@@ -322,5 +326,4 @@ CLEANFILES =
 include $(srcdir)/../../am/rebuild.am
 
 ## Not used
-##
 EXTRA_DIST += mktex.cnf
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index a9d6023332b..84d5fa3463b 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -694,6 +694,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = . doc man $(am__append_6)
+#
 EXTRA_DIST = PROJECTS putenv.c bsnl.awk cnf-to-paths.awk $(TESTS) \
 	tests/cnfnewline/texmf.cnf mktex.cnf
 AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
@@ -799,10 +800,12 @@ dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
 dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
 dist_noinst_DATA = texmf.cnf
 bin_links = mktexlsr:texhash
+AM_TESTS_ENVIRONMENT = LN_S='$(LN_S)'; export LN_S; \
+	LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
+#
 TESTS = tests/cnfnewline.test tests/kpseaccess.test \
 	tests/kpsereadlink.test tests/kpsestat.test \
 	tests/kpsewhich.test
-TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
 
 # Rebuild
 rebuild_prereq = 
@@ -2328,6 +2331,7 @@ uninstall-bin-links:
 install-exec-hook: install-bin-links
 
 uninstall-hook: uninstall-bin-links
+#
 tests/cnfnewline.log tests/kpsewhich.log: kpsewhich$(EXEEXT)
 tests/kpseaccess.log: kpseaccess$(EXEEXT)
 tests/kpsereadlink.log: kpsereadlink$(EXEEXT)
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index f18113c55ec..c50fed355b9 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,7 +1,11 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-06-30  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* tests/[uhv_dl.pfa, uhv_dl.pfb, uhv_dl.ps, Ant.pfb, tmf.pfa, tmf.pfb]:
-	Update for the version 2.106.
+	Update for version 2.106.
 
 2016-06-22  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 0504dd633b4..10019fa2d37 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -33,12 +33,11 @@ config.force: $(KPATHSEA_DEPEND)
 DISTCLEANFILES = config.force CXXLD.sh
 
 ## Tests
-##
+AM_TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE); export LCDF_TYPETOOLS_TREE;
+
 TESTS = tests/t1.test tests/tfm.test tests/ttf.test
 EXTRA_DIST += $(TESTS)
 
-TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE)
-
 ## tests/t1.test
 EXTRA_DIST += tests/t2c.enc tests/uhvrrc8a.pfb \
 	tests/uhv_dl.pfa tests/uhv_dl.pfb tests/uhv_dl.ps \
@@ -53,4 +52,3 @@ EXTRA_DIST += tests/FonetikaDaniaIwonaeBold.ttf tests/texmfhome.otf \
 	tests/Fon.post tests/Fon.t42 \
 	tests/tmf.info tests/tmf.pfa tests/tmf.pfb tests/tmf.tables
 DISTCLEANFILES += Fon* tmf.*
-
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 485dbcbf769..f81f727b671 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -579,8 +579,8 @@ NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
 NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
 DISTCLEANFILES = config.force CXXLD.sh uhv* Ant* a_enhg3c.enc Fon* \
 	tmf.*
+AM_TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE); export LCDF_TYPETOOLS_TREE;
 TESTS = tests/t1.test tests/tfm.test tests/ttf.test
-TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE)
 all: autoconf.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/Build/source/texk/musixtnt/ChangeLog b/Build/source/texk/musixtnt/ChangeLog
index 026bb161c3e..bf4c3c1b14a 100644
--- a/Build/source/texk/musixtnt/ChangeLog
+++ b/Build/source/texk/musixtnt/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-02-10  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import musixtnt-2016-01-30.
diff --git a/Build/source/texk/musixtnt/Makefile.am b/Build/source/texk/musixtnt/Makefile.am
index 92de274a728..28a3ab94380 100644
--- a/Build/source/texk/musixtnt/Makefile.am
+++ b/Build/source/texk/musixtnt/Makefile.am
@@ -4,13 +4,11 @@
 ## Copyright 2017 Karl Berry <tex-live@tug.org>
 ## Copyright 2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 ## We want to re-distribute the whole musixtnt source tree.
-##
 EXTRA_DIST = $(MUSIXTNT_TREE)
 
 ## Changes applied to the original source tree
-##
 EXTRA_DIST += TLpatches
 
 # Files not to be distributed
@@ -37,10 +35,10 @@ dist_man_MANS = \
 @KPATHSEA_RULE@
 
 ## Tests
-##
-TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"
+AM_TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"; export testsrc;
+#
 TESTS = $(MUSIXTNT_TREE)/msxlint.test
 $(MUSIXTNT_TREE)/msxlint.log: msxlint$(EXEEXT)
+
 DISTCLEANFILES = linttest.*
 NEVER_DIST += $(TESTS:.test=.log) $(TESTS:.test=.trs)
-
diff --git a/Build/source/texk/musixtnt/Makefile.in b/Build/source/texk/musixtnt/Makefile.in
index 905ba8ac3c6..51668318197 100644
--- a/Build/source/texk/musixtnt/Makefile.in
+++ b/Build/source/texk/musixtnt/Makefile.in
@@ -563,7 +563,8 @@ LDADD = $(KPATHSEA_LIBS)
 dist_man_MANS = \
 	$(MUSIXTNT_TREE)/msxlint.1
 
-TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"
+AM_TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"; export testsrc;
+#
 TESTS = $(MUSIXTNT_TREE)/msxlint.test
 DISTCLEANFILES = linttest.*
 all: config.h
diff --git a/Build/source/texk/ps2pk/ChangeLog b/Build/source/texk/ps2pk/ChangeLog
index ec4ccb7c663..b160465e451 100644
--- a/Build/source/texk/ps2pk/ChangeLog
+++ b/Build/source/texk/ps2pk/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-04-03  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* arith.h, pk2bm.c: Avoid compiler warnings.
diff --git a/Build/source/texk/ps2pk/Makefile.am b/Build/source/texk/ps2pk/Makefile.am
index 72e759b1923..83445d433b2 100644
--- a/Build/source/texk/ps2pk/Makefile.am
+++ b/Build/source/texk/ps2pk/Makefile.am
@@ -1,8 +1,10 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/ps2pk/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2017      Karl Berry <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 bin_PROGRAMS = mag pfb2pfa pk2bm ps2pk
 noinst_PROGRAMS = pktest
 
@@ -104,11 +106,12 @@ $(mag_OBJECTS) $(pfb2pfa_OBJECTS) $(pk2m_OBJECTS) $(ps2pk_OBJECTS) $(pktest_OBJE
 dist_man1_MANS = mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1
 
 ## Tests.
-##
-TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)'
+AM_TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH;
+#
 TESTS = tests/lmmath.test tests/ps2pk.test
 tests/lmmath.log: ps2pk$(EXEEXT)
 tests/ps2pk.log: pfb2pfa$(EXEEXT) ps2pk$(EXEEXT) pk2bm$(EXEEXT) pktest$(EXEEXT) mag$(EXEEXT)
+#
 EXTRA_DIST = $(TESTS)
 DISTCLEANFILES =
 ## tests/lmmath.test
@@ -120,7 +123,6 @@ EXTRA_DIST += tests/Symbol.afm tests/Symbol.alpha.hex tests/Symbol.alpha.pix \
 DISTCLEANFILES += Symbol*
 
 ## Not used
-##
 EXTRA_DIST += \
 	CHANGES.type1 \
 	INSTALLATION \
@@ -140,4 +142,3 @@ EXTRA_DIST += \
 	texfiles.h \
 	trig.h \
 	usenet
-
diff --git a/Build/source/texk/ps2pk/Makefile.in b/Build/source/texk/ps2pk/Makefile.in
index df3be15d71e..ee3ab7d44f8 100644
--- a/Build/source/texk/ps2pk/Makefile.in
+++ b/Build/source/texk/ps2pk/Makefile.in
@@ -661,8 +661,10 @@ pktest_SOURCES = \
 	pktest.c
 
 dist_man1_MANS = mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1
-TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)'
+AM_TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH;
+#
 TESTS = tests/lmmath.test tests/ps2pk.test
+#
 EXTRA_DIST = $(TESTS) tests/lmmi12.600pk tests/Symbol.afm \
 	tests/Symbol.alpha.hex tests/Symbol.alpha.pix tests/Symbol.pfa \
 	tests/Symbol.pfb tests/Symbol10.300pk CHANGES.type1 \
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ba0389f75a0..189b79c0c5a 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2017-03-18  Karl Berry  <karl@tug.org>
 
 	* NEWS,
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 4e6b2cc5788..cb971eaa3ff 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -1,6 +1,8 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/web2c/.
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2017      Karl Berry <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
@@ -147,7 +149,12 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(
 # For trip, trap, and other tests
 DIFF = diff
 DIFFFLAGS =
-TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir) DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)'
+AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir;
+AM_TESTS_ENVIRONMENT += DIFF='$(DIFF)'; export DIFF;
+AM_TESTS_ENVIRONMENT += DIFFFLAGS='$(DIFFFLAGS)'; export DIFFFLAGS;
+AM_TESTS_ENVIRONMENT += LN_S='$(LN_S)'; export LN_S;
+AM_TESTS_ENVIRONMENT += KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH;
+
 triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
 
 .PHONY: triptrap
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 8d49a3c300d..b3de21b9271 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2587,7 +2587,10 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(
 # For trip, trap, and other tests
 DIFF = diff
 DIFFFLAGS = 
-TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir) DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)'
+AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \
+	DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \
+	DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \
+	KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH;
 triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh
 
 # The environment for making dumps.