diff options
| author | Karl Berry <karl@freefriends.org> | 2017-03-27 18:00:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-03-27 18:00:45 +0000 |
| commit | f6e2e4efbdd44ba2ce51fc1555361c23ec6c8beb (patch) | |
| tree | 9997ce03ee8a6032c671c664ff04abc7e89e5729 /Build/source/texk/chktex | |
| parent | d87f8cf45a06f7b5db4d26d44843a947ab47f55f (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/chktex')
| -rw-r--r-- | Build/source/texk/chktex/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/chktex/Makefile.am | 8 | ||||
| -rw-r--r-- | Build/source/texk/chktex/Makefile.in | 15 |
3 files changed, 15 insertions, 12 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 |