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/libpng | |
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/libpng')
-rw-r--r-- | Build/source/libs/libpng/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.am | 10 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 3d760abea67..66c275438c0 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/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. + 2017-03-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import libpng-1.6.29. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index e76d1f5fbe7..249af956119 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/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 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 @@ nodist_libpng_a_SOURCES = \ $(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_prereq = rebuild_target = all include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index cfc78b27786..82871d33dde 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -562,7 +562,7 @@ target_alias = @target_alias@ 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 @@ nodist_libpng_a_SOURCES = \ @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@TESTS = libpng.test @build_TRUE@dist_check_SCRIPTS = libpng.test CLEANFILES = pngout.png rebuild.stamp |