texlive[43617] Build/source/utils/pmx: Makefile.am

commits+karl at tug.org commits+karl at tug.org
Mon Mar 27 20:00:46 CEST 2017 

Revision: 43617
          http://tug.org/svn/texlive?view=revision&revision=43617
Author:   karl
Date:     2017-03-27 20:00:45 +0200 (Mon, 27 Mar 2017)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/Build/source/libs/libpng/ChangeLog
    trunk/Build/source/libs/libpng/Makefile.am
    trunk/Build/source/libs/libpng/Makefile.in
    trunk/Build/source/libs/teckit/ChangeLog
    trunk/Build/source/libs/teckit/Makefile.am
    trunk/Build/source/libs/teckit/Makefile.in
    trunk/Build/source/libs/xpdf/ChangeLog
    trunk/Build/source/libs/xpdf/Makefile.am
    trunk/Build/source/libs/xpdf/Makefile.in
    trunk/Build/source/libs/zziplib/ChangeLog
    trunk/Build/source/libs/zziplib/Makefile.am
    trunk/Build/source/libs/zziplib/Makefile.in
    trunk/Build/source/texk/chktex/ChangeLog
    trunk/Build/source/texk/chktex/Makefile.am
    trunk/Build/source/texk/chktex/Makefile.in
    trunk/Build/source/texk/dvi2tty/ChangeLog
    trunk/Build/source/texk/dvi2tty/Makefile.am
    trunk/Build/source/texk/dvi2tty/Makefile.in
    trunk/Build/source/texk/dvipsk/ChangeLog
    trunk/Build/source/texk/dvipsk/Makefile.am
    trunk/Build/source/texk/dvipsk/Makefile.in
    trunk/Build/source/texk/dvisvgm/Makefile.in
    trunk/Build/source/texk/gregorio/ChangeLog
    trunk/Build/source/texk/gregorio/Makefile.am
    trunk/Build/source/texk/gregorio/Makefile.in
    trunk/Build/source/texk/kpathsea/ChangeLog
    trunk/Build/source/texk/kpathsea/Makefile.am
    trunk/Build/source/texk/kpathsea/Makefile.in
    trunk/Build/source/texk/lcdf-typetools/ChangeLog
    trunk/Build/source/texk/lcdf-typetools/Makefile.am
    trunk/Build/source/texk/lcdf-typetools/Makefile.in
    trunk/Build/source/texk/musixtnt/ChangeLog
    trunk/Build/source/texk/musixtnt/Makefile.am
    trunk/Build/source/texk/musixtnt/Makefile.in
    trunk/Build/source/texk/ps2pk/ChangeLog
    trunk/Build/source/texk/ps2pk/Makefile.am
    trunk/Build/source/texk/ps2pk/Makefile.in
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/Makefile.am
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/utils/autosp/ChangeLog
    trunk/Build/source/utils/autosp/Makefile.am
    trunk/Build/source/utils/autosp/Makefile.in
    trunk/Build/source/utils/autosp/autosp-src/autosp.test
    trunk/Build/source/utils/pmx/ChangeLog
    trunk/Build/source/utils/pmx/Makefile.am
    trunk/Build/source/utils/pmx/Makefile.in

Property Changed:
----------------
    trunk/Build/source/texk/dvipsk/Makefile.am
    trunk/Build/source/texk/ps2pk/Makefile.am
    trunk/Build/source/texk/web2c/Makefile.am
    trunk/Build/source/utils/autosp/Makefile.in
    trunk/Build/source/utils/autosp/autosp-src/autosp.test

Modified: trunk/Build/source/libs/libpng/ChangeLog
===================================================================
--- trunk/Build/source/libs/libpng/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/libpng/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,8 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+	(EXTRA_DIST): TLpatches not Tlpatches.
+
 2017-03-16 Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import libpng-1.6.29.

Modified: trunk/Build/source/libs/libpng/Makefile.am
===================================================================
--- trunk/Build/source/libs/libpng/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/libpng/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -7,14 +7,12 @@
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
 ##   with or without modifications, as long as this notice is preserved.
-##
+
 ## We want to re-distribute the whole libpng source tree.
-##
 EXTRA_DIST = $(LIBPNG_TREE)
 
 ## Changes applied to the original source tree
-##
-EXTRA_DIST += Tlpatches
+EXTRA_DIST += TLpatches
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
@@ -48,8 +46,7 @@
 $(libpng_a_OBJECTS): config.force
 
 ## Tests
-##
-TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
+AM_TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE); export LIBPNG_TREE;
 if build
 TESTS = libpng.test
 check_PROGRAMS = pngtest
@@ -76,4 +73,3 @@
 rebuild_target = all
 
 include $(srcdir)/../../am/rebuild.am
-

Modified: trunk/Build/source/libs/libpng/Makefile.in
===================================================================
--- trunk/Build/source/libs/libpng/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/libpng/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -562,7 +562,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(LIBPNG_TREE) Tlpatches
+EXTRA_DIST = $(LIBPNG_TREE) TLpatches
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
@@ -592,7 +592,7 @@
 	@LIBPNG_TREE@/pngerror.c \
 	@LIBPNG_TREE@/pngpread.c
 
-TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
+AM_TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE); export LIBPNG_TREE;
 @build_TRUE at TESTS = libpng.test
 @build_TRUE at dist_check_SCRIPTS = libpng.test
 CLEANFILES = pngout.png rebuild.stamp

Modified: trunk/Build/source/libs/teckit/ChangeLog
===================================================================
--- trunk/Build/source/libs/teckit/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/teckit/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (EXTRA_DIST): TLpatches not Tlpatches.
+
 2016-12-30  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import TECkit-2.5.6.

Modified: trunk/Build/source/libs/teckit/Makefile.am
===================================================================
--- trunk/Build/source/libs/teckit/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/teckit/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -4,14 +4,12 @@
 ## Copyright 2017 Karl Berry <tex-live at tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 ## We want to re-distribute the whole original TECkit source tree.
-##
 EXTRA_DIST = $(TECKIT_TREE)
 
 ## Patches applied to the original source tree
-##
-EXTRA_DIST += Tlpatches
+EXTRA_DIST += TLpatches
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
@@ -79,4 +77,3 @@
 rebuild_target = all
 
 include $(srcdir)/../../am/rebuild.am
-

Modified: trunk/Build/source/libs/teckit/Makefile.in
===================================================================
--- trunk/Build/source/libs/teckit/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/teckit/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -576,7 +576,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(TECKIT_TREE) Tlpatches teckit.test tex-text.map \
+EXTRA_DIST = $(TECKIT_TREE) TLpatches teckit.test tex-text.map \
 	tex-text.tec
 NEVER_DIST = `find . $(NEVER_NAMES)`
 

Modified: trunk/Build/source/libs/xpdf/ChangeLog
===================================================================
--- trunk/Build/source/libs/xpdf/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/xpdf/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (EXTRA_DIST): TLpatches not Tlpatches.
+
 2016-02-15  Karl Berry  <karl at tug.org>
 
 	* xpdf-PATCHES: rename from xpdf-3.04-PATCHES.

Modified: trunk/Build/source/libs/xpdf/Makefile.am
===================================================================
--- trunk/Build/source/libs/xpdf/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/xpdf/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -31,8 +31,7 @@
 EXTRA_DIST += xpdf-foolabs
 
 ## Actual patches applied to the original source tree
-##
-EXTRA_DIST += Tlpatches
+EXTRA_DIST += TLpatches
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
@@ -123,4 +122,3 @@
 CLEANFILES =
 
 include $(srcdir)/../../am/rebuild.am
-

Modified: trunk/Build/source/libs/xpdf/Makefile.in
===================================================================
--- trunk/Build/source/libs/xpdf/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/xpdf/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -395,7 +395,7 @@
 #========================================================================
 #========================================================================
 ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = $(XPDF_TREE) xpdf-foolabs Tlpatches
+EXTRA_DIST = $(XPDF_TREE) xpdf-foolabs TLpatches
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed

Modified: trunk/Build/source/libs/zziplib/ChangeLog
===================================================================
--- trunk/Build/source/libs/zziplib/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/zziplib/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,8 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+	(EXTRA_DIST): TLpatches not Tlpatches.
+
 2016-02-22  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* Makefile.am, configure.ac: New convention.

Modified: trunk/Build/source/libs/zziplib/Makefile.am
===================================================================
--- trunk/Build/source/libs/zziplib/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/zziplib/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -7,14 +7,12 @@
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
 ##   with or without modifications, as long as this notice is preserved.
-##
+
 ## We want to re-distribute the whole zziplib source tree.
-##
 EXTRA_DIST = $(ZZIPLIB_TREE)
 
 ## Changes applied to the original source tree
-##
-EXTRA_DIST += Tlpatches
+EXTRA_DIST += TLpatches
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
@@ -43,7 +41,7 @@
 
 DISTCLEANFILES = include/_msvc.in _configs.sed
 
-TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE)
+AM_TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE); export ZZIPLIB_TREE;
 if build
 TESTS = zziplib.test
 check_PROGRAMS = unzzip
@@ -71,4 +69,3 @@
 CLEANFILES =
 
 include $(srcdir)/../../am/rebuild.am
-

Modified: trunk/Build/source/libs/zziplib/Makefile.in
===================================================================
--- trunk/Build/source/libs/zziplib/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/libs/zziplib/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -572,7 +572,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(ZZIPLIB_TREE) Tlpatches
+EXTRA_DIST = $(ZZIPLIB_TREE) TLpatches
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
@@ -596,7 +596,7 @@
 	@ZZIPLIB_TREE@/zzip/zip.c
 
 DISTCLEANFILES = include/_msvc.in _configs.sed config.force
-TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE)
+AM_TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE); export ZZIPLIB_TREE;
 @build_TRUE at TESTS = zziplib.test
 @build_TRUE at dist_check_SCRIPTS = zziplib.test
 nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c

Modified: trunk/Build/source/texk/chktex/ChangeLog
===================================================================
--- trunk/Build/source/texk/chktex/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/chktex/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-09-15  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* Import ChkTeX 1.7.6.

Modified: trunk/Build/source/texk/chktex/Makefile.am
===================================================================
--- trunk/Build/source/texk/chktex/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/chktex/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -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 @@
 @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
-

Modified: trunk/Build/source/texk/chktex/Makefile.in
===================================================================
--- trunk/Build/source/texk/chktex/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/chktex/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -14,8 +14,14 @@
 
 @SET_MAKE@
 
+#************************************************************************
+#
+#  Adapted for TeX Live from chktex/Makefile.in
+#
+#************************************************************************
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -577,12 +583,6 @@
 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 @@
 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
 

Modified: trunk/Build/source/texk/dvi2tty/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvi2tty/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/dvi2tty/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-04-03  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* Delete the directory dvi2tty-PATCHES/ because upstream

Modified: trunk/Build/source/texk/dvi2tty/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvi2tty/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/dvi2tty/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -53,7 +53,7 @@
 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 @@
 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
-

Modified: trunk/Build/source/texk/dvi2tty/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvi2tty/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/dvi2tty/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -581,7 +581,7 @@
 	$(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

Modified: trunk/Build/source/texk/dvipsk/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipsk/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/dvipsk/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2017-03-21  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* dvips.c: Show information and exit if dvips finds options

Modified: trunk/Build/source/texk/dvipsk/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvipsk/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/dvipsk/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,6 +1,8 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/dvipsk/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2017      Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 SUBDIRS = squeeze
@@ -115,11 +117,11 @@
 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) \


Property changes on: trunk/Build/source/texk/dvipsk/Makefile.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id
\ No newline at end of property
Modified: trunk/Build/source/texk/dvipsk/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvipsk/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/dvipsk/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -738,9 +738,11 @@
 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)'

Modified: trunk/Build/source/texk/dvisvgm/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/dvisvgm/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -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 at tug.org>

Modified: trunk/Build/source/texk/gregorio/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/gregorio/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-09-29  Karl Berry  <karl at tug.org>
 
 	* configure.ac (FILENAME_VERSION): no need to define for TL.

Modified: trunk/Build/source/texk/gregorio/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/gregorio/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -55,9 +55,9 @@
 @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

Modified: trunk/Build/source/texk/gregorio/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/gregorio/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -599,7 +599,7 @@
 	@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

Modified: trunk/Build/source/texk/kpathsea/ChangeLog
===================================================================
--- trunk/Build/source/texk/kpathsea/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/kpathsea/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2017-03-18  Karl Berry  <karl at tug.org>
 
 	* version.ac,

Modified: trunk/Build/source/texk/kpathsea/Makefile.am
===================================================================
--- trunk/Build/source/texk/kpathsea/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/kpathsea/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -4,7 +4,7 @@
 ## Copyright 2017 Karl Berry <tex-live at tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 SUBDIRS = . doc man
 
 EXTRA_DIST = PROJECTS
@@ -303,14 +303,18 @@
 
 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 @@
 include $(srcdir)/../../am/rebuild.am
 
 ## Not used
-##
 EXTRA_DIST += mktex.cnf

Modified: trunk/Build/source/texk/kpathsea/Makefile.in
===================================================================
--- trunk/Build/source/texk/kpathsea/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/kpathsea/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -694,6 +694,7 @@
 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_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 @@
 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)

Modified: trunk/Build/source/texk/lcdf-typetools/ChangeLog
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/lcdf-typetools/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,7 +1,11 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-06-30  Akira Kakuto  <kakuto at 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 at fuk.kindai.ac.jp>
 

Modified: trunk/Build/source/texk/lcdf-typetools/Makefile.am
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/lcdf-typetools/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -33,12 +33,11 @@
 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 @@
 	tests/Fon.post tests/Fon.t42 \
 	tests/tmf.info tests/tmf.pfa tests/tmf.pfb tests/tmf.tables
 DISTCLEANFILES += Fon* tmf.*
-

Modified: trunk/Build/source/texk/lcdf-typetools/Makefile.in
===================================================================
--- trunk/Build/source/texk/lcdf-typetools/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/lcdf-typetools/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -579,8 +579,8 @@
 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
 

Modified: trunk/Build/source/texk/musixtnt/ChangeLog
===================================================================
--- trunk/Build/source/texk/musixtnt/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/musixtnt/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-02-10  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import musixtnt-2016-01-30.

Modified: trunk/Build/source/texk/musixtnt/Makefile.am
===================================================================
--- trunk/Build/source/texk/musixtnt/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/musixtnt/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -4,13 +4,11 @@
 ## Copyright 2017 Karl Berry <tex-live at tug.org>
 ## Copyright 2015 Peter Breitenlohner <tex-live at 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 @@
 @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)
-

Modified: trunk/Build/source/texk/musixtnt/Makefile.in
===================================================================
--- trunk/Build/source/texk/musixtnt/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/musixtnt/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -563,7 +563,8 @@
 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

Modified: trunk/Build/source/texk/ps2pk/ChangeLog
===================================================================
--- trunk/Build/source/texk/ps2pk/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/ps2pk/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-04-03  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* arith.h, pk2bm.c: Avoid compiler warnings.

Modified: trunk/Build/source/texk/ps2pk/Makefile.am
===================================================================
--- trunk/Build/source/texk/ps2pk/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/ps2pk/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,8 +1,10 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/ps2pk/
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2017      Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at 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 @@
 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 @@
 DISTCLEANFILES += Symbol*
 
 ## Not used
-##
 EXTRA_DIST += \
 	CHANGES.type1 \
 	INSTALLATION \
@@ -140,4 +142,3 @@
 	texfiles.h \
 	trig.h \
 	usenet
-


Property changes on: trunk/Build/source/texk/ps2pk/Makefile.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id
\ No newline at end of property
Modified: trunk/Build/source/texk/ps2pk/Makefile.in
===================================================================
--- trunk/Build/source/texk/ps2pk/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/ps2pk/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -661,8 +661,10 @@
 	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 \

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/web2c/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2017-03-18  Karl Berry  <karl at tug.org>
 
 	* NEWS,

Modified: trunk/Build/source/texk/web2c/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/web2c/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,6 +1,8 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/web2c/.
 ##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2017      Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
@@ -147,7 +149,12 @@
 # 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


Property changes on: trunk/Build/source/texk/web2c/Makefile.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/texk/web2c/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -2587,7 +2587,10 @@
 # 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.

Modified: trunk/Build/source/utils/autosp/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/utils/autosp/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,8 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+	* autosp.test: adapt.
+
 2017-02-28  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* Import autosp-2016-11-02.

Modified: trunk/Build/source/utils/autosp/Makefile.am
===================================================================
--- trunk/Build/source/utils/autosp/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/utils/autosp/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,9 +1,9 @@
 ## $Id$
 ## Makefile.am for the TeX Live subdirectory utils/autosp/
 ##
-## Copyright 2016 Karl Berry <tex-live at tug.org>
+## Copyright 2016-2017 Karl Berry <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 ## We want to re-distribute the whole original ps2eps source tree.
 EXTRA_DIST = $(AUTOSP_TREE)
 
@@ -27,17 +27,11 @@
 	$(AUTOSP_TREE)/autosp.1
 
 ## Tests
-
-# We want to use the test and tests/ tree from the original dist.
-# So as to avoid embedding the original dist dir name in the test
-# script, we use $test_srcdir, defined here.
-AM_TESTS_ENVIRONMENT = test_srcdir=$(srcdir)/$(AUTOSP_TREE)/tests;
-
+AM_TESTS_ENVIRONMENT = AUTOSP_TREE=$(AUTOSP_TREE); export AUTOSP_TREE;
+#
 TESTS = $(AUTOSP_TREE)/autosp.test
 EXTRA_DIST += $(TESTS)
 autosp.log: autosp$(EXEEXT)
-
+#
 ## autosp.test files
 EXTRA_DIST += $(AUTOSP_TREE)/tests
-
-

Modified: trunk/Build/source/utils/autosp/Makefile.in
===================================================================
(Binary files differ)

Index: trunk/Build/source/utils/autosp/Makefile.in
===================================================================
--- trunk/Build/source/utils/autosp/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/utils/autosp/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)

Property changes on: trunk/Build/source/utils/autosp/Makefile.in
___________________________________________________________________
Modified: svn:mime-type
## -1 +1 ##
-application/x-awk
\ No newline at end of property
+text/plain
\ No newline at end of property
Modified: trunk/Build/source/utils/autosp/autosp-src/autosp.test
===================================================================
(Binary files differ)

Index: trunk/Build/source/utils/autosp/autosp-src/autosp.test
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/autosp.test	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/utils/autosp/autosp-src/autosp.test	2017-03-27 18:00:45 UTC (rev 43617)

Property changes on: trunk/Build/source/utils/autosp/autosp-src/autosp.test
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/x-shellscript
\ No newline at end of property
Modified: trunk/Build/source/utils/pmx/ChangeLog
===================================================================
--- trunk/Build/source/utils/pmx/ChangeLog	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/utils/pmx/ChangeLog	2017-03-27 18:00:45 UTC (rev 43617)
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl at freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-12-09  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* Import pmx 2.7.6.

Modified: trunk/Build/source/utils/pmx/Makefile.am
===================================================================
--- trunk/Build/source/utils/pmx/Makefile.am	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/utils/pmx/Makefile.am	2017-03-27 18:00:45 UTC (rev 43617)
@@ -240,12 +240,11 @@
 dist_man1_MANS = pmxab.1 scor2prt.1
 
 ## Tests
-##
+AM_TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests; export test_src;
+#
 TESTS = $(PMX_TREE)/pmx.test
 $(PMX_TREE)/pmx.log: pmxab$(EXEEXT) scor2prt$(EXEEXT)
 
-TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests
-
 ## $(PMX_TREE)/pmx.test
 DISTCLEANFILES = barsant* pmxaerr.dat
 

Modified: trunk/Build/source/utils/pmx/Makefile.in
===================================================================
--- trunk/Build/source/utils/pmx/Makefile.in	2017-03-27 06:27:30 UTC (rev 43616)
+++ trunk/Build/source/utils/pmx/Makefile.in	2017-03-27 18:00:45 UTC (rev 43617)
@@ -845,8 +845,9 @@
 	@PMX_TREE@/libf2c/qbitbits.c @PMX_TREE@/libf2c/qbitshft.c \
 	@PMX_TREE@/libf2c/signbit.c
 dist_man1_MANS = pmxab.1 scor2prt.1
+AM_TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests; export test_src;
+#
 TESTS = $(PMX_TREE)/pmx.test
-TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests
 DISTCLEANFILES = barsant* pmxaerr.dat
 all: all-am

More information about the tex-live-commits mailing list