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/libs/zziplib | |
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/libs/zziplib')
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.am | 9 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index 3a8e1c32635..1f9f138c48a 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,8 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + (EXTRA_DIST): TLpatches not Tlpatches. + 2016-02-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Makefile.am, configure.ac: New convention. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 45f663d55db..e655816c109 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -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 @@ $(libzzip_a_OBJECTS): config.force 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 @@ rebuild_target = all CLEANFILES = include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index b7f6a71f253..503a305fb77 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -572,7 +572,7 @@ target_alias = @target_alias@ 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 @@ nodist_libzzip_a_SOURCES = \ @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@TESTS = zziplib.test @build_TRUE@dist_check_SCRIPTS = zziplib.test nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c |