From 567dac608f05e119bd3377f4ce06f650462ed689 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Mar 2017 17:43:10 +0000 Subject: EXTRA_DIST=TLpatches to reflect new directory names git-svn-id: svn://tug.org/texlive/trunk@43567 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/chktex/Makefile.am | 6 ++++-- Build/source/texk/chktex/Makefile.in | 6 +++--- Build/source/texk/cjkutils/Makefile.am | 7 +++++-- Build/source/texk/cjkutils/Makefile.in | 2 +- Build/source/texk/detex/Makefile.am | 6 ++++-- Build/source/texk/detex/Makefile.in | 2 +- Build/source/texk/dvi2tty/Makefile.am | 10 +++++----- Build/source/texk/dvi2tty/Makefile.in | 2 +- Build/source/texk/dvipng/Makefile.am | 11 ++++------- Build/source/texk/dvipng/Makefile.in | 5 +---- Build/source/texk/dvisvgm/Makefile.am | 2 +- Build/source/texk/dvisvgm/Makefile.in | 2 +- Build/source/texk/gregorio/Makefile.am | 7 ++++--- Build/source/texk/gregorio/Makefile.in | 2 +- Build/source/texk/lcdf-typetools/Makefile.am | 15 +++++---------- Build/source/texk/lcdf-typetools/Makefile.in | 13 ++++--------- Build/source/texk/musixtnt/Makefile.am | 6 ++++-- Build/source/texk/musixtnt/Makefile.in | 2 +- 18 files changed, 50 insertions(+), 56 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index 2b53b4b34fb..4ec9036551a 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -1,6 +1,8 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/chktex/ ## -## Copyright (C) 2010-2015 Peter Breitenlohner +## Copyright 2017 Karl Berry +## Copyright 2010-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -18,7 +20,7 @@ EXTRA_DIST = $(CHKTEX_TREE) ## Patches applied to the original source tree ## -EXTRA_DIST += chktex-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 42523e4f6ca..7a49897f2d4 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -583,9 +583,9 @@ top_srcdir = @top_srcdir@ # Adapted for TeX Live from chktex/Makefile.in # #************************************************************************ -EXTRA_DIST = $(CHKTEX_TREE) chktex-PATCHES regex/COPYING.LIB \ - regex/README $(top_builddir)/../../build-aux/relpath \ - ChkTeX.pdf ChkTeX.tex $(TESTS) +EXTRA_DIST = $(CHKTEX_TREE) TLpatches regex/COPYING.LIB regex/README \ + $(top_builddir)/../../build-aux/relpath ChkTeX.pdf ChkTeX.tex \ + $(TESTS) NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index b3f2b9a8a6a..bde0452caa0 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -1,12 +1,15 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/cjkutils/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner +## Copyright 2017 Karl Berry +## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ## We want to re-distribute the whole original cjk/utils source tree. EXTRA_DIST = $(CJKUTILS_TREE) + ## Patches applied to the original source tree -EXTRA_DIST += cjkutils-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in index 8809a4d9c75..ba83f87c98e 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -590,7 +590,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(CJKUTILS_TREE) cjkutils-PATCHES $(CWEB_TEX) $(CWEB_DVI) \ +EXTRA_DIST = $(CJKUTILS_TREE) TLpatches $(CWEB_TEX) $(CWEB_DVI) \ $(TESTS) tests/bg5conv.tex tests/bg5conv.cjk tests/cefconv.tex \ tests/cefconv.cjk tests/cef5conv.tex tests/cef5conv.cjk \ tests/cefsconv.tex tests/cefsconv.cjk tests/extconv.tex \ diff --git a/Build/source/texk/detex/Makefile.am b/Build/source/texk/detex/Makefile.am index 35ac7b40c91..532485d4028 100644 --- a/Build/source/texk/detex/Makefile.am +++ b/Build/source/texk/detex/Makefile.am @@ -1,12 +1,14 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/detex/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner +## Copyright 2017 Karl Berry +## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ## We want to re-distribute the whole original detex source tree. EXTRA_DIST = $(DETEX_TREE) ## Patches applied to the original source tree -EXTRA_DIST += detex-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in index 55fb1b42112..5617eeb5f3e 100644 --- a/Build/source/texk/detex/Makefile.in +++ b/Build/source/texk/detex/Makefile.in @@ -557,7 +557,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(DETEX_TREE) detex-PATCHES test.lout test.tex test.tout +EXTRA_DIST = $(DETEX_TREE) TLpatches test.lout test.tex test.tout NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am index fdbd52b0c5c..d55aa023382 100644 --- a/Build/source/texk/dvi2tty/Makefile.am +++ b/Build/source/texk/dvi2tty/Makefile.am @@ -1,15 +1,15 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/dvi2tty/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner +## Copyright 2017 Karl Berry +## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. -## + ## We want to re-distribute the whole original dvi2tty source tree. -## EXTRA_DIST = $(DVI2TTY_TREE) ## Patches applied to the original source tree -## -EXTRA_DIST += dvi2tty-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in index 764af13ff8e..021d7782ea9 100644 --- a/Build/source/texk/dvi2tty/Makefile.in +++ b/Build/source/texk/dvi2tty/Makefile.in @@ -553,7 +553,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(DVI2TTY_TREE) dvi2tty-PATCHES $(TESTS) ligtest.dis \ +EXTRA_DIST = $(DVI2TTY_TREE) TLpatches $(TESTS) ligtest.dis \ ligtest.tty test.tty testc.tty tests.tty testu.tty NEVER_DIST = `find . $(NEVER_NAMES)` diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 91467872d35..a201f29f4a4 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -1,15 +1,13 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/dvipng/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner +## Copyright 2017 Karl Berry +## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## -#************************************************************************ -# # Adapted for TeX Live from dvipng-src/Makefile.in # Copyright (C) 2002-2008 Jan-Åke Larsson # -#************************************************************************ -## ## We want to re-distribute the whole original dvipng source tree. ## ## With current automake (1.10.2) 'make distcheck' fails when @@ -18,8 +16,7 @@ EXTRA_DIST = $(DVIPNG_TREE) ## Patches applied to the original source tree -## -EXTRA_DIST += dvipng-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 6336a82e5e8..d133a9b161d 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -633,13 +633,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -#************************************************************************ -# # Adapted for TeX Live from dvipng-src/Makefile.in # Copyright (C) 2002-2008 Jan-Åke Larsson # -#************************************************************************ -EXTRA_DIST = $(DVIPNG_TREE) dvipng-PATCHES dvipng.test dvipng-test.dvi +EXTRA_DIST = $(DVIPNG_TREE) TLpatches dvipng.test dvipng-test.dvi NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am index ff2f5a5c86f..97f05d37f52 100644 --- a/Build/source/texk/dvisvgm/Makefile.am +++ b/Build/source/texk/dvisvgm/Makefile.am @@ -16,7 +16,7 @@ DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = $(DVISVGM_TREE) ## Patches applied to the original source tree -EXTRA_DIST += dvisvgm-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in index 8fb1099f565..3b81fce7c12 100644 --- a/Build/source/texk/dvisvgm/Makefile.in +++ b/Build/source/texk/dvisvgm/Makefile.in @@ -584,7 +584,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . $(DVISVGM_TREE) DIST_SUBDIRS = $(SUBDIRS) -EXTRA_DIST = $(DVISVGM_TREE) dvisvgm-PATCHES $(TESTS) +EXTRA_DIST = $(DVISVGM_TREE) TLpatches $(TESTS) NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am index 7bd20adc715..e45e82a2f24 100644 --- a/Build/source/texk/gregorio/Makefile.am +++ b/Build/source/texk/gregorio/Makefile.am @@ -1,14 +1,15 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory texk/gregorio/ ## -## Copyright 2016 Karl Berry +## Copyright 2016-2017 Karl Berry ## Copyright 2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. -## + ## We want to re-distribute the whole original gregorio source tree. EXTRA_DIST = $(GREGORIO_TREE) + ## Patches applied to the original source tree -EXTRA_DIST += gregorio-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/gregorio/Makefile.in b/Build/source/texk/gregorio/Makefile.in index cc8213ea29a..8ca00d24aa3 100644 --- a/Build/source/texk/gregorio/Makefile.in +++ b/Build/source/texk/gregorio/Makefile.in @@ -561,7 +561,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(GREGORIO_TREE) gregorio-PATCHES $(TESTS) +EXTRA_DIST = $(GREGORIO_TREE) TLpatches $(TESTS) NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index b1d56782fbc..0504dd633b4 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -1,26 +1,21 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/lcdf-typetools/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner +## Copyright 2017 Karl Berry +## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## -#************************************************************************ -# # Adapted for TeX Live from lcdf-typetools-src/Makefile.am # Copyright (c) 2003-2011 Eddie Kohler -# -#************************************************************************ -## + ## We use the original lcdf-typetools source tree. -## SUBDIRS = . $(LCDF_TYPETOOLS_TREE) DIST_SUBDIRS = $(SUBDIRS) ## Patches applied to the original source tree -## -EXTRA_DIST = lcdf-typetools-PATCHES +EXTRA_DIST = TLpatches ## We must explicitly distribute some top-level files. -## EXTRA_DIST += \ $(LCDF_TYPETOOLS_TREE)/autoconf.h.in \ $(LCDF_TYPETOOLS_TREE)/configure.ac \ diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index b5b46cc719e..485dbcbf769 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -13,6 +13,9 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# Adapted for TeX Live from lcdf-typetools-src/Makefile.am +# Copyright (c) 2003-2011 Eddie Kohler VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -559,17 +562,9 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -#************************************************************************ -# -# Adapted for TeX Live from lcdf-typetools-src/Makefile.am -# Copyright (c) 2003-2011 Eddie Kohler -# -#************************************************************************ SUBDIRS = . $(LCDF_TYPETOOLS_TREE) DIST_SUBDIRS = $(SUBDIRS) -EXTRA_DIST = lcdf-typetools-PATCHES \ - $(LCDF_TYPETOOLS_TREE)/autoconf.h.in \ +EXTRA_DIST = TLpatches $(LCDF_TYPETOOLS_TREE)/autoconf.h.in \ $(LCDF_TYPETOOLS_TREE)/configure.ac $(LCDF_TYPETOOLS_TREE)/m4 \ $(TESTS) tests/t2c.enc tests/uhvrrc8a.pfb tests/uhv_dl.pfa \ tests/uhv_dl.pfb tests/uhv_dl.ps tests/uhv_re.afm \ diff --git a/Build/source/texk/musixtnt/Makefile.am b/Build/source/texk/musixtnt/Makefile.am index b3fea203eab..92de274a728 100644 --- a/Build/source/texk/musixtnt/Makefile.am +++ b/Build/source/texk/musixtnt/Makefile.am @@ -1,6 +1,8 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/musixtnt/ ## -## Copyright (C) 2015 Peter Breitenlohner +## Copyright 2017 Karl Berry +## Copyright 2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ## We want to re-distribute the whole musixtnt source tree. @@ -9,7 +11,7 @@ EXTRA_DIST = $(MUSIXTNT_TREE) ## Changes applied to the original source tree ## -EXTRA_DIST += musixtnt-PATCHES +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/musixtnt/Makefile.in b/Build/source/texk/musixtnt/Makefile.in index bd529982077..905ba8ac3c6 100644 --- a/Build/source/texk/musixtnt/Makefile.in +++ b/Build/source/texk/musixtnt/Makefile.in @@ -545,7 +545,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(MUSIXTNT_TREE) musixtnt-PATCHES +EXTRA_DIST = $(MUSIXTNT_TREE) TLpatches NEVER_DIST = `find . $(NEVER_NAMES)` $(TESTS:.test=.log) \ $(TESTS:.test=.trs) -- cgit v1.2.3