summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-27 18:00:45 +0000
committerKarl Berry <karl@freefriends.org>2017-03-27 18:00:45 +0000
commitf6e2e4efbdd44ba2ce51fc1555361c23ec6c8beb (patch)
tree9997ce03ee8a6032c671c664ff04abc7e89e5729 /Build/source/texk/dvipsk
parentd87f8cf45a06f7b5db4d26d44843a947ab47f55f (diff)
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
Diffstat (limited to 'Build/source/texk/dvipsk')
-rw-r--r--Build/source/texk/dvipsk/ChangeLog4
-rw-r--r--Build/source/texk/dvipsk/Makefile.am14
-rw-r--r--Build/source/texk/dvipsk/Makefile.in8
3 files changed, 17 insertions, 9 deletions
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)'