From f6e2e4efbdd44ba2ce51fc1555361c23ec6c8beb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 Mar 2017 18:00:45 +0000 Subject: 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 --- Build/source/libs/xpdf/ChangeLog | 4 ++++ Build/source/libs/xpdf/Makefile.am | 4 +--- Build/source/libs/xpdf/Makefile.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'Build/source/libs/xpdf') diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index f46aca5fab4..d8345036d99 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry + + * Makefile.am (EXTRA_DIST): TLpatches not Tlpatches. + 2016-02-15 Karl Berry * xpdf-PATCHES: rename from xpdf-3.04-PATCHES. diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index ea4b2e22f3f..f5005923108 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -31,8 +31,7 @@ EXTRA_DIST = $(XPDF_TREE) 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 @@ rebuild_target = all CLEANFILES = include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index 21f0a33bb07..6d6082dbb40 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -395,7 +395,7 @@ top_srcdir = @top_srcdir@ #======================================================================== #======================================================================== 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 -- cgit v1.2.3