reautoconf+sync

git-svn-id: svn://tug.org/texlive/trunk@39848 c570f23f-e606-0410-a88d-b1316a301751

35 files changed, 155 insertions, 131 deletions

diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index bbc04b9cc5e..062a59468ce 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -4205,8 +4205,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 HB_VERSION_MAJOR=1
-HB_VERSION_MINOR=1
-HB_VERSION_MICRO=3
+HB_VERSION_MINOR=2
+HB_VERSION_MICRO=1
 HB_VERSION=1.2.1
 
 ac_ext=c
diff --git a/Build/source/libs/mpfr/Makefile.in b/Build/source/libs/mpfr/Makefile.in
index d921ace4711..e6fc045b9aa 100644
--- a/Build/source/libs/mpfr/Makefile.in
+++ b/Build/source/libs/mpfr/Makefile.in
@@ -499,12 +499,12 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing \
 	$(top_srcdir)/../../build-aux/test-driver \
-	$(top_srcdir)/mpfr-src/src/mparam_h.in \
-	../../build-aux/compile ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/ltmain.sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ChangeLog README
+	$(top_srcdir)/mpfr-src/src/mparam_h.in ../../build-aux/compile \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog \
+	README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 1d93d5da727..83f9f6d5094 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -576,8 +576,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(TECKIT_TREE) TECkit-PATCHES teckit.test \
-	tex-text.map tex-text.tec
+EXTRA_DIST = $(TECKIT_TREE) TECkit-PATCHES teckit.test tex-text.map \
+	tex-text.tec
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index 7c50fb0f88c..3b9b68bfe2b 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -590,12 +590,11 @@ 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) $(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 tests/extconv.cjk tests/sjisconv.tex \
-	tests/sjisconv.cjk
+EXTRA_DIST = $(CJKUTILS_TREE) cjkutils-PATCHES $(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 \
+	tests/extconv.cjk tests/sjisconv.tex tests/sjisconv.cjk
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in
index 72f4eb8be36..02db6ea81dc 100644
--- a/Build/source/texk/detex/Makefile.in
+++ b/Build/source/texk/detex/Makefile.in
@@ -557,8 +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) detex-PATCHES test.lout test.tex test.tout
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in
index 1be9024988e..168954e6f25 100644
--- a/Build/source/texk/dvi2tty/Makefile.in
+++ b/Build/source/texk/dvi2tty/Makefile.in
@@ -553,8 +553,8 @@ 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 ligtest.tty test.tty testc.tty tests.tty testu.tty
+EXTRA_DIST = $(DVI2TTY_TREE) dvi2tty-PATCHES $(TESTS) ligtest.dis \
+	ligtest.tty test.tty testc.tty tests.tty testu.tty
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 779d9c98654..5524b2feec5 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -639,8 +639,7 @@ top_srcdir = @top_srcdir@
 #  Copyright (C) 2002-2008 Jan-Åke Larsson
 #
 #************************************************************************
-EXTRA_DIST = $(DVIPNG_TREE) dvipng-PATCHES dvipng.test \
-	dvipng-test.dvi
+EXTRA_DIST = $(DVIPNG_TREE) dvipng-PATCHES dvipng.test dvipng-test.dvi
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in
index 6024dea5f73..53f9a68e53a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/Makefile.in
@@ -88,7 +88,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = lcdf-typetools-2.105
+subdir = lcdf-typetools-src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -430,9 +430,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in
index 04bf5ce7628..93d9b6b75b0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/cfftot1/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = cfftot1$(EXEEXT)
-subdir = lcdf-typetools-2.105/cfftot1
+subdir = lcdf-typetools-src/cfftot1
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -386,9 +386,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/cfftot1/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/cfftot1/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/cfftot1/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/cfftot1/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in
index 48e13d4503e..b8cdf837e2a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/libefont/Makefile.in
@@ -88,7 +88,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = lcdf-typetools-2.105/libefont
+subdir = lcdf-typetools-src/libefont
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -382,9 +382,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/libefont/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/libefont/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/libefont/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/libefont/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in
index a7bf4cf2dbe..a2bac606e54 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/liblcdf/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @FIXLIBC_TRUE@am__append_1 = fixlibc.c
-subdir = lcdf-typetools-2.105/liblcdf
+subdir = lcdf-typetools-src/liblcdf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -371,9 +371,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/liblcdf/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/liblcdf/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/liblcdf/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/liblcdf/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in
index e036e80a21f..cb55676a4fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmafm/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmafm$(EXEEXT)
-subdir = lcdf-typetools-2.105/mmafm
+subdir = lcdf-typetools-src/mmafm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -366,9 +366,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/mmafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/mmafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/mmafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/mmafm/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in
index 2ec8abfa444..2811f715a97 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/mmpfb/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mmpfb$(EXEEXT)
-subdir = lcdf-typetools-2.105/mmpfb
+subdir = lcdf-typetools-src/mmpfb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -389,9 +389,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/mmpfb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/mmpfb/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/mmpfb/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/mmpfb/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in
index 7d4b86eab26..d05f175d1fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otfinfo/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = otfinfo$(EXEEXT)
-subdir = lcdf-typetools-2.105/otfinfo
+subdir = lcdf-typetools-src/otfinfo
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -368,9 +368,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/otfinfo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/otfinfo/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/otfinfo/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/otfinfo/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in
index b0f3ba0fc26..56ccf3524fb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/Makefile.in
@@ -93,7 +93,7 @@ bin_PROGRAMS = otftotfm$(EXEEXT)
 @have_kpathsea_TRUE@am__append_2 = $(KPATHSEA_INCLUDES)
 @have_kpathsea_TRUE@am__append_3 = $(KPATHSEA_LIBS)
 @have_kpathsea_TRUE@am__append_4 = $(KPATHSEA_DEPEND)
-subdir = lcdf-typetools-2.105/otftotfm
+subdir = lcdf-typetools-src/otftotfm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -405,9 +405,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/otftotfm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/otftotfm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/otftotfm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/otftotfm/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in
index 21f5d86625e..ff943b997c9 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1dotlessj/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1dotlessj$(EXEEXT)
-subdir = lcdf-typetools-2.105/t1dotlessj
+subdir = lcdf-typetools-src/t1dotlessj
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -366,9 +366,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1dotlessj/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1dotlessj/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1dotlessj/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/t1dotlessj/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in
index 1cec79ec182..27f1b390b8d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1lint/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1lint$(EXEEXT)
-subdir = lcdf-typetools-2.105/t1lint
+subdir = lcdf-typetools-src/t1lint
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -386,9 +386,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1lint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1lint/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1lint/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/t1lint/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in
index 703764b0a8b..288f154d9d2 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1rawafm/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1rawafm$(EXEEXT)
-subdir = lcdf-typetools-2.105/t1rawafm
+subdir = lcdf-typetools-src/t1rawafm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -366,9 +366,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1rawafm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1rawafm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1rawafm/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/t1rawafm/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in
index 984b7091805..0900eced6eb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1reencode/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1reencode$(EXEEXT)
-subdir = lcdf-typetools-2.105/t1reencode
+subdir = lcdf-typetools-src/t1reencode
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -386,9 +386,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1reencode/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1reencode/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1reencode/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/t1reencode/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in
index 7d095b31e56..516d58644f8 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/t1testpage/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = t1testpage$(EXEEXT)
-subdir = lcdf-typetools-2.105/t1testpage
+subdir = lcdf-typetools-src/t1testpage
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -366,9 +366,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1testpage/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/t1testpage/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/t1testpage/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/t1testpage/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in
index 9e73f716582..8b3dea2e517 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/ttftotype42/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = ttftotype42$(EXEEXT)
-subdir = lcdf-typetools-2.105/ttftotype42
+subdir = lcdf-typetools-src/ttftotype42
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
@@ -366,9 +366,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-2.105/ttftotype42/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lcdf-typetools-src/ttftotype42/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign lcdf-typetools-2.105/ttftotype42/Makefile
+	  $(AUTOMAKE) --foreign lcdf-typetools-src/ttftotype42/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index 03cdd007aab..831b40b2e7e 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/env perl
-# $Id: fmtutil.pl 39056 2015-12-08 23:55:42Z karl $
+# $Id: fmtutil.pl 39813 2016-02-22 05:25:37Z preining $
 # fmtutil - utility to maintain format files.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
-# Copyright 2014-2015 Norbert Preining
+# Copyright 2014-2016 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -24,11 +24,11 @@ BEGIN {
   TeX::Update->import();
 }
 
-my $svnid = '$Id: fmtutil.pl 39056 2015-12-08 23:55:42Z karl $';
-my $lastchdate = '$Date: 2015-12-09 00:55:42 +0100 (Wed, 09 Dec 2015) $';
+my $svnid = '$Id: fmtutil.pl 39813 2016-02-22 05:25:37Z preining $';
+my $lastchdate = '$Date: 2016-02-22 06:25:37 +0100 (Mon, 22 Feb 2016) $';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 39056 $';
+my $svnrev = '$Revision: 39813 $';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
@@ -451,9 +451,37 @@ sub select_and_rebuild_format {
   # TODO
   # original fmtutil.sh was stricter about existence of the hyphen file
   # not sure how we proceed here; let's implicitly ignore.
-  $doit = 1 if ($what eq 'byhyphen' &&
-                $whatarg eq 
-                (split(/,/ , $alldata->{'merged'}{$fmt}{$eng}{'hyphen'}))[0]);
+  #
+  # original fmtutil.sh seemed to have accepted full path to the hyphen
+  # file, so that one could give
+  #   --byhyphen /full/path/to/the/hyphen/file
+  # but this does not work anymore (see Debian bug report #815416)
+  if ($what eq 'byhyphen') {
+    my $fmthyp = (split(/,/ , $alldata->{'merged'}{$fmt}{$eng}{'hyphen'}))[0];
+    if ($fmthyp ne '-') {
+      if ($whatarg =~ m!^/!) {
+        # $whatarg is a full path, we need to expand $fmthyp, too
+        chomp (my $fmthyplong = `kpsewhich -progname=$fmt -engine=$eng $fmthyp`) ;
+        if ($fmthyplong) {
+          $fmthyp = $fmthyplong;
+        } else {
+          # we might have searched language.dat --engine=tex --progname=tex
+          # which will not work. Search again without engine/format
+          chomp ($fmthyplong = `kpsewhich $fmthyp`) ;
+          if ($fmthyplong) {
+            $fmthyp = $fmthyplong;
+          } else {
+            # don't give warnings or errors, it might be that the hyphen
+            # file is not existing at all. See TODO above
+            #print_deferred_warning("hyphen $fmthyp for $fmt/$eng cannot be expanded.\n");
+          }
+        }
+      }
+      if ($whatarg eq $fmthyp) {
+        $doit = 1;
+      }
+    }
+  }
   if ($doit) {
     return rebuild_one_format($fmt,$eng);
   } else {
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 2ba378d9297..cafbdce5fca 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 39410 2016-01-17 00:07:22Z karl $
+# $Id: tlmgr.pl 39763 2016-02-18 13:45:29Z preining $
 #
 # Copyright 2008-2016 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
 
-my $svnrev = '$Revision: 39410 $';
-my $datrev = '$Date: 2016-01-17 01:07:22 +0100 (Sun, 17 Jan 2016) $';
+my $svnrev = '$Revision: 39763 $';
+my $datrev = '$Date: 2016-02-18 14:45:29 +0100 (Thu, 18 Feb 2016) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -1030,7 +1030,7 @@ sub action_remove {
   info("$prg remove: dry run, no changes will be made\n") if $opts{"dry-run"};
   my @packs = @ARGV;
   #
-  # we have to be carefull not to remove too many packages. The idea is
+  # we have to be careful not to remove too many packages. The idea is
   # as follows:
   # - let A be the set of all packages to be removed from the cmd line
   # - let A* be the set of A with all dependencies expanded
@@ -1481,8 +1481,8 @@ sub action_info {
       }
     }
     # some packages might depend on other packages, so do not
-    # include arbitrary package in the list of collections, but
-    # only collectons:
+    # include arbitrary packages in the list of collections, but
+    # only collections:
     @colls = grep {m;^collection-;} @colls;
     print "package:     ", $tlp->name, "\n";
     print "repository:  ", $source_found, "\n" if (defined($source_found));
@@ -2019,25 +2019,25 @@ sub action_backup {
 # =====================================================================
 #                  INFRASTRUCTURE UPDATE ON WINDOWS
 # =====================================================================
-#      Infrastructure files cannot be updated directly from the 
-# tlmgr.pl script due to file locking problem on Windows - files that 
-# are in use (either open or executing) cannot be removed or replaced. 
-# For that reason the update process is performed by a batch script 
+#      Infrastructure files cannot be updated directly from the
+# tlmgr.pl script due to file locking problem on Windows - files that
+# are in use (either open or executing) cannot be removed or replaced.
+# For that reason the update process is performed by a batch script
 # outside of tlmgr.pl.
-#      There are three pieces involved in the update: tlmgr.bat 
-# launcher, write_w32_updater subroutine below and a batch 
+#      There are three pieces involved in the update: tlmgr.bat
+# launcher, write_w32_updater subroutine below and a batch
 # updater script. Their roles are as follows:
 # * tlmgr.bat is a watchdog, it launches tlmgr.pl and watches for
-#   the updater script that is to be executed. If the updater script 
-#   exists before tlmgr.pl is launched, it will be removed or 
-#   tlmgr.bat will abort if it fails to do so. This means that the 
-#   updater script has to be created by the current invocation of 
-#   tlmgr.pl. Futhermore, the updater script is renamed from 
-#   updater-w32 to updater-w32.bat just before it is run, and thus 
+#   the updater script that is to be executed. If the updater script
+#   exists before tlmgr.pl is launched, it will be removed or
+#   tlmgr.bat will abort if it fails to do so. This means that the
+#   updater script has to be created by the current invocation of
+#   tlmgr.pl. Furthermore, the updater script is renamed from
+#   updater-w32 to updater-w32.bat just before it is run, and thus
 #   it can be executed only once.
 # * write_w32_updater subroutine in tlmgr.pl prepares the update
 #   and writes the updater script. Packages in .xz archives are
-#   dowloaded/copied and uncompressed to .tar files. Also .tar 
+#   downloaded/copied and uncompressed to .tar files. Also .tar
 #   backups of the current packages are made. If everything is 
 #   successful, the update script is created from the template. 
 #   Otherwise the update is aborted.
@@ -2104,7 +2104,7 @@ sub write_w32_updater {
     my $localtlp = $localtlpdb->get_package($pkg);
     my $oldrev = $localtlp->revision;
     my $newrev = $mediatlp->revision;
-    # we do install documenation files for category Documentation even if
+    # we do install documentation files for category Documentation even if
     # option("install_docfiles") is false
     my $opt_real_doc = ($mediatlp->category =~ m/documentation/i) ? 1 : $opt_doc;
     my @pkg_parts = ($pkg);
@@ -2827,10 +2827,10 @@ sub action_update {
       }
     }
     #
-    # the idea of supressing warnings is simply that if a file is present
+    # the idea of suppressing warnings is simply that if a file is present
     # in more than one package either in the beginning or after a full 
     # update then this should give a warning. In all other cases
-    # the warning should be supressed.
+    # the warning should be suppressed.
     for my $f (keys %old_files_to_pkgs) {
       my @a = @{$old_files_to_pkgs{$f}};
       $do_warn_on_move{$f} = 1 if ($#a > 0)
@@ -3477,7 +3477,7 @@ sub check_announce_format_triggers {
 #   take .ARCH deps into account
 #
 # tlmgr install --reinstall ...
-#   behaves exactely like without --reinstall BUT the following two
+#   behaves exactly like without --reinstall BUT the following two
 #   differences:
 #   . dependencies are not expanded from collection to collection, so
 #     if you reinstall a collection then all its dependencies of type
@@ -6357,7 +6357,7 @@ debugging.
 
 C<tlmgr> logs all package actions (install, remove, update, failed
 updates, failed restores) to a separate log file, by default
-C<TEXMFSYSVAR/web2c/tlmgr.log>.  This option allows you to specific a
+C<TEXMFSYSVAR/web2c/tlmgr.log>.  This option allows you to specify a
 different file for the log.
 
 =item B<--pause>
diff --git a/Build/source/utils/t1utils/Makefile.in b/Build/source/utils/t1utils/Makefile.in
index 3b7cd0ea44c..b72dd237308 100644
--- a/Build/source/utils/t1utils/Makefile.in
+++ b/Build/source/utils/t1utils/Makefile.in
@@ -528,8 +528,8 @@ top_srcdir = @top_srcdir@
 #  Adapted for TeX Live from t1utils/Makefile.am
 #
 #************************************************************************
-EXTRA_DIST = $(T1UTILS_TREE) t1utils-PATCHES $(TESTS) \
-	tests/Symbol.pfa tests/Symbol.pfb tests/Symbol.raw
+EXTRA_DIST = $(T1UTILS_TREE) t1utils-PATCHES $(TESTS) tests/Symbol.pfa \
+	tests/Symbol.pfb tests/Symbol.raw
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
 # Files not to be distributed
diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in
index 7bab6f146db..7fb4bee1ffb 100644
--- a/Build/source/utils/vlna/Makefile.in
+++ b/Build/source/utils/vlna/Makefile.in
@@ -308,8 +308,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(VLNA_TREE) vlna-PATCHES vlna.dvi vlna.tex \
-	vlna.idx vlna.scn
+EXTRA_DIST = $(VLNA_TREE) vlna-PATCHES vlna.dvi vlna.tex vlna.idx \
+	vlna.scn
 NEVER_DIST = `find . $(NEVER_NAMES)`
 NEVER_NAMES = -name .svn
 NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 7b93244c882..031a7f6a1e8 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -349,10 +349,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = README-clisp xindy-PATCHES \
-	$(XINDY_TREE)/Makefile.am $(XINDY_TREE)/VERSION \
-	$(XINDY_TREE)/configure.ac $(XINDY_TREE)/m4 \
-	$(top_builddir)/../../build-aux/relpath
+EXTRA_DIST = README-clisp xindy-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)
 NEVER_DIST = `find . $(NEVER_NAMES)`
diff --git a/Build/source/utils/xindy/xindy-src/Makefile.in b/Build/source/utils/xindy/xindy-src/Makefile.in
index 68931a92a52..b53449161de 100644
--- a/Build/source/utils/xindy/xindy-src/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/Makefile.in
@@ -95,7 +95,7 @@ host_triplet = @host@
 
 # do we build docs?
 @BUILDDOCS_TRUE@am__append_2 = doc
-subdir = xindy-2.5.1
+subdir = xindy-src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -346,9 +346,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/doc/Makefile.in b/Build/source/utils/xindy/xindy-src/doc/Makefile.in
index a546e497af4..1f861e8781f 100644
--- a/Build/source/utils/xindy/xindy-src/doc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/doc/Makefile.in
@@ -87,7 +87,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy-2.5.1/doc
+subdir = xindy-src/doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/st
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/doc/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/doc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/make-rules/Makefile.in b/Build/source/utils/xindy/xindy-src/make-rules/Makefile.in
index b3f01a41450..0af9e108326 100644
--- a/Build/source/utils/xindy/xindy-src/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/make-rules/Makefile.in
@@ -86,7 +86,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy-2.5.1/make-rules
+subdir = xindy-src/make-rules
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -302,9 +302,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/make-rules/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/make-rules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/make-rules/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/make-rules/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in
index 06f320bcb51..c4f7f11cbaf 100644
--- a/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in
@@ -87,7 +87,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy-2.5.1/make-rules/alphabets
+subdir = xindy-src/make-rules/alphabets
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -668,9 +668,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/al
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/make-rules/alphabets/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/make-rules/alphabets/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/make-rules/alphabets/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/make-rules/alphabets/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy-src/make-rules/inputenc/Makefile.in
index 6cbe32b910f..362dec35056 100644
--- a/Build/source/utils/xindy/xindy-src/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/make-rules/inputenc/Makefile.in
@@ -87,7 +87,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy-2.5.1/make-rules/inputenc
+subdir = xindy-src/make-rules/inputenc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -383,9 +383,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/make-rules/inputenc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/make-rules/inputenc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/make-rules/inputenc/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/make-rules/inputenc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/modules/Makefile.in b/Build/source/utils/xindy/xindy-src/modules/Makefile.in
index 72c4696c7eb..a32778960f6 100644
--- a/Build/source/utils/xindy/xindy-src/modules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/modules/Makefile.in
@@ -87,7 +87,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy-2.5.1/modules
+subdir = xindy-src/modules
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -291,9 +291,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/ba
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/modules/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/modules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/modules/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/modules/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/src/Makefile.in b/Build/source/utils/xindy/xindy-src/src/Makefile.in
index 37ca75fa479..7c8f1633a82 100644
--- a/Build/source/utils/xindy/xindy-src/src/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/src/Makefile.in
@@ -87,7 +87,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy-2.5.1/src
+subdir = xindy-src/src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -298,9 +298,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/src/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/src/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-src/tex2xindy/Makefile.in
index 64ac828dd22..73b87a83fa5 100644
--- a/Build/source/utils/xindy/xindy-src/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/tex2xindy/Makefile.in
@@ -88,7 +88,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = tex2xindy$(EXEEXT)
-subdir = xindy-2.5.1/tex2xindy
+subdir = xindy-src/tex2xindy
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -326,9 +326,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/tex2xindy/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/tex2xindy/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/tex2xindy/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/tex2xindy/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
diff --git a/Build/source/utils/xindy/xindy-src/user-commands/Makefile.in b/Build/source/utils/xindy/xindy-src/user-commands/Makefile.in
index bb730becfbd..7a0148f5225 100644
--- a/Build/source/utils/xindy/xindy-src/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/user-commands/Makefile.in
@@ -88,7 +88,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @TEXLIVE_BUILD_FALSE@am__append_1 = $(scripts)
-subdir = xindy-2.5.1/user-commands
+subdir = xindy-src/user-commands
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -280,9 +280,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.5.1/user-commands/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-src/user-commands/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy-2.5.1/user-commands/Makefile
+	  $(AUTOMAKE) --foreign xindy-src/user-commands/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \