From 1d78b29cbfadf6f6599dd90e24f09b3b57a29215 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 28 Apr 2014 12:36:57 +0000 Subject: Fix 'make dist' git-svn-id: svn://tug.org/texlive/trunk@33717 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/ChangeLog | 4 ++++ Build/source/Makefile.am | 16 +++++++++------- Build/source/Makefile.in | 14 ++++++++------ Build/source/doc/Makefile.am | 2 +- Build/source/doc/Makefile.in | 2 +- Build/source/utils/xindy/ChangeLog | 2 +- Build/source/utils/xindy/Makefile.am | 17 ++--------------- Build/source/utils/xindy/Makefile.in | 11 +++-------- 8 files changed, 29 insertions(+), 39 deletions(-) (limited to 'Build') diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index d3be277456c..6b4f7772d86 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2014-04-28 Peter Breitenlohner + + Makefile.am: New names for README.* files. + 2014-04-17 Karl Berry * version.ac (tex_live_version): starting pretest, no more /dev. diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am index bb0db4acad1..ba2b04fd80f 100644 --- a/Build/source/Makefile.am +++ b/Build/source/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live top-level ## -## Copyright (C) 2009-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ## Ensure aclocal.m4 is up to date @@ -14,12 +14,14 @@ distcleancheck_listfiles = find . -type f -o -type l -print EXTRA_DIST = \ Build \ - README.coding \ - README.config \ - README.cross \ - README.distro \ - README.hacking \ - README.layout \ + README.0overview \ + README.1prerequisites \ + README.2building \ + README.3installing \ + README.4layout \ + README.5configure \ + README.6cross \ + README.7coding \ build-aux/README.TL \ m4/ChangeLog \ m4/README \ diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index 9c85217a575..86df1e0df05 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -451,12 +451,14 @@ distuninstallcheck_listfiles = find . -type f -o -type l -print distcleancheck_listfiles = find . -type f -o -type l -print EXTRA_DIST = \ Build \ - README.coding \ - README.config \ - README.cross \ - README.distro \ - README.hacking \ - README.layout \ + README.0overview \ + README.1prerequisites \ + README.2building \ + README.3installing \ + README.4layout \ + README.5configure \ + README.6cross \ + README.7coding \ build-aux/README.TL \ m4/ChangeLog \ m4/README \ diff --git a/Build/source/doc/Makefile.am b/Build/source/doc/Makefile.am index 59c4aaecd77..92414c60f4b 100644 --- a/Build/source/doc/Makefile.am +++ b/Build/source/doc/Makefile.am @@ -7,7 +7,7 @@ info_TEXINFOS = tlbuild.texi texlive_TEXINFOS = build-tools.txt -EXTRA_DIST = ${PDFS} splitinfo.gawk +EXTRA_DIST = build-tools.txt ${PDFS} splitinfo.gawk # just for development of the doc. readme-files: tlbuild.texi diff --git a/Build/source/doc/Makefile.in b/Build/source/doc/Makefile.in index 6a7b118e774..79948b3970b 100644 --- a/Build/source/doc/Makefile.in +++ b/Build/source/doc/Makefile.in @@ -431,7 +431,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ info_TEXINFOS = tlbuild.texi texlive_TEXINFOS = build-tools.txt -EXTRA_DIST = ${PDFS} splitinfo.gawk +EXTRA_DIST = build-tools.txt ${PDFS} splitinfo.gawk all: all-am .SUFFIXES: diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index 96d79c660b0..520b96bb37c 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,7 +1,7 @@ 2014-04-28 Peter Breitenlohner Import xindy-2.5.0. - * configure.ac, Version.ac: Adapted. + * Makefile.am, configure.ac, Version.ac: Adapted. 2013-10-23 Peter Breitenlohner diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am index 141ddc0e642..e21d951a7c0 100644 --- a/Build/source/utils/xindy/Makefile.am +++ b/Build/source/utils/xindy/Makefile.am @@ -19,23 +19,10 @@ EXTRA_DIST += $(XINDY_TREE)-PATCHES ## We must explicitly distribute some top-level files. ## EXTRA_DIST += \ - $(XINDY_TREE)/AUTHORS \ - $(XINDY_TREE)/COPYING \ - $(XINDY_TREE)/INSTALL \ $(XINDY_TREE)/Makefile.am \ - $(XINDY_TREE)/README \ - $(XINDY_TREE)/NEWS \ $(XINDY_TREE)/VERSION \ - $(XINDY_TREE)/m4 \ - $(XINDY_TREE)/configure.ac - -## For future reorganisation of alphabets/Makefile.am, -## used to build alphabets/LANG/Makefile.am fragments. -## -EXTRA_DIST += \ - $(XINDY_TREE)/make-rules/alphabets/Makefile.am.not-yet \ - $(XINDY_TREE)/make-rules/alphabets/lang.defs \ - $(XINDY_TREE)/make-rules/alphabets/mk-lang.sh + $(XINDY_TREE)/configure.ac \ + $(XINDY_TREE)/m4 # in case of an SVN repository dist-hook: diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index 30f080b991b..75443e61239 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -340,14 +340,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = README-clisp $(XINDY_TREE)-PATCHES $(XINDY_TREE)/AUTHORS \ - $(XINDY_TREE)/COPYING $(XINDY_TREE)/INSTALL \ - $(XINDY_TREE)/Makefile.am $(XINDY_TREE)/README \ - $(XINDY_TREE)/NEWS $(XINDY_TREE)/VERSION $(XINDY_TREE)/m4 \ - $(XINDY_TREE)/configure.ac \ - $(XINDY_TREE)/make-rules/alphabets/Makefile.am.not-yet \ - $(XINDY_TREE)/make-rules/alphabets/lang.defs \ - $(XINDY_TREE)/make-rules/alphabets/mk-lang.sh \ +EXTRA_DIST = README-clisp $(XINDY_TREE)-PATCHES \ + $(XINDY_TREE)/Makefile.am $(XINDY_TREE)/VERSION \ + $(XINDY_TREE)/configure.ac $(XINDY_TREE)/m4 \ $(top_builddir)/../../build-aux/relpath SUBDIRS = . $(XINDY_TREE) DIST_SUBDIRS = $(SUBDIRS) -- cgit v1.2.3