update xindy build (again)

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

71 files changed, 61 insertions, 132 deletions

diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 11f768f848d..533ffd8627d 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -197,7 +197,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index de4147d6098..12ba249a1fa 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -561,7 +561,6 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-is_TL
 BUILDDOCS_FALSE
 BUILDDOCS_TRUE
 BUILDRULES_FALSE
@@ -4106,14 +4105,6 @@ fi
 ac_config_files="$ac_config_files Makefile xindy/Makefile xindy/src/Makefile xindy/tex2xindy/Makefile xindy/modules/Makefile xindy/modules/base/Makefile xindy/modules/class/Makefile xindy/modules/lang/Makefile xindy/modules/lang/german/Makefile xindy/modules/lang/latin/Makefile xindy/modules/ord/Makefile xindy/modules/rules/Makefile xindy/modules/styles/Makefile xindy/user-commands/Makefile xindy/make-rules/Makefile xindy/make-rules/alphabets/Makefile xindy/make-rules/alphabets/albanian/Makefile xindy/make-rules/alphabets/belarusian/Makefile xindy/make-rules/alphabets/bulgarian/Makefile xindy/make-rules/alphabets/croatian/Makefile xindy/make-rules/alphabets/czech/Makefile xindy/make-rules/alphabets/danish/Makefile xindy/make-rules/alphabets/dutch/Makefile xindy/make-rules/alphabets/english/Makefile xindy/make-rules/alphabets/esperanto/Makefile xindy/make-rules/alphabets/estonian/Makefile xindy/make-rules/alphabets/finnish/Makefile xindy/make-rules/alphabets/french/Makefile xindy/make-rules/alphabets/general/Makefile xindy/make-rules/alphabets/georgian/Makefile xindy/make-rules/alphabets/german/Makefile xindy/make-rules/alphabets/greek/Makefile xindy/make-rules/alphabets/gypsy/Makefile xindy/make-rules/alphabets/hausa/Makefile xindy/make-rules/alphabets/hebrew/Makefile xindy/make-rules/alphabets/hungarian/Makefile xindy/make-rules/alphabets/icelandic/Makefile xindy/make-rules/alphabets/italian/Makefile xindy/make-rules/alphabets/klingon/Makefile xindy/make-rules/alphabets/kurdish/Makefile xindy/make-rules/alphabets/latin/Makefile xindy/make-rules/alphabets/latvian/Makefile xindy/make-rules/alphabets/lithuanian/Makefile xindy/make-rules/alphabets/lower-sorbian/Makefile xindy/make-rules/alphabets/macedonian/Makefile xindy/make-rules/alphabets/mongolian/Makefile xindy/make-rules/alphabets/norwegian/Makefile xindy/make-rules/alphabets/polish/Makefile xindy/make-rules/alphabets/portuguese/Makefile xindy/make-rules/alphabets/romanian/Makefile xindy/make-rules/alphabets/russian/Makefile xindy/make-rules/alphabets/serbian/Makefile xindy/make-rules/alphabets/slovak/Makefile xindy/make-rules/alphabets/slovenian/Makefile xindy/make-rules/alphabets/spanish/Makefile xindy/make-rules/alphabets/swedish/Makefile xindy/make-rules/alphabets/test1/Makefile xindy/make-rules/alphabets/turkish/Makefile xindy/make-rules/alphabets/ukrainian/Makefile xindy/make-rules/alphabets/upper-sorbian/Makefile xindy/make-rules/alphabets/vietnamese/Makefile xindy/make-rules/inputenc/Makefile xindy/make-rules/styles/Makefile xindy/doc/Makefile xindy/doc/style-tutorial/Makefile"
 
 
-# In a TeX Live build enable_texlive_build is yes, otherwise undefined.
-is_TL="$enable_texlive_build"
-
-ac_config_files="$ac_config_files xindy/user-commands/texindy"
-
-ac_config_files="$ac_config_files xindy/user-commands/xindy"
-
-
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -4926,8 +4917,6 @@ do
     "xindy/make-rules/styles/Makefile") CONFIG_FILES="$CONFIG_FILES xindy/make-rules/styles/Makefile" ;;
     "xindy/doc/Makefile") CONFIG_FILES="$CONFIG_FILES xindy/doc/Makefile" ;;
     "xindy/doc/style-tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES xindy/doc/style-tutorial/Makefile" ;;
-    "xindy/user-commands/texindy") CONFIG_FILES="$CONFIG_FILES xindy/user-commands/texindy" ;;
-    "xindy/user-commands/xindy") CONFIG_FILES="$CONFIG_FILES xindy/user-commands/xindy" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -5441,8 +5430,6 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "xindy/user-commands/texindy":F) chmod +x xindy/user-commands/texindy ;;
-    "xindy/user-commands/xindy":F) chmod +x xindy/user-commands/xindy ;;
 
   esac
 done # for ac_tag
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index 29fa7b57e09..b45f0d1679d 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -203,9 +203,4 @@ AC_CONFIG_FILES([Makefile \
 	    	xindy/doc/style-tutorial/Makefile \
 ])
 
-# In a TeX Live build enable_texlive_build is yes, otherwise undefined.
-AC_SUBST([is_TL], ["$enable_texlive_build"])
-AC_CONFIG_FILES([xindy/user-commands/texindy], [chmod +x xindy/user-commands/texindy])
-AC_CONFIG_FILES([xindy/user-commands/xindy], [chmod +x xindy/user-commands/xindy])
-
 AC_OUTPUT
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL
index 11832d65aa3..88f6c31fbea 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL
@@ -1,19 +1,6 @@
-diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/configure.ac xindy/configure.ac
---- xindy.orig/configure.ac	2010-05-11 01:12:10.000000000 +0200
-+++ xindy/configure.ac	2010-05-12 11:23:08.972502978 +0200
-@@ -162,4 +162,9 @@
- 	    	doc/style-tutorial/Makefile
- ])
- 
-+# In a TeX Live build enable_texlive_build is yes, otherwise undefined.
-+AC_SUBST([is_TL], ["$enable_texlive_build"])
-+AC_CONFIG_FILES([user-commands/texindy], [chmod +x user-commands/texindy])
-+AC_CONFIG_FILES([user-commands/xindy], [chmod +x user-commands/xindy])
-+
- AC_OUTPUT
-diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
 --- xindy.orig/user-commands/Makefile.am	2010-05-11 01:15:51.000000000 +0200
-+++ xindy/user-commands/Makefile.am	2010-05-12 11:27:23.459084841 +0200
++++ xindy/user-commands/Makefile.am	2010-05-12 21:23:55.065336668 +0200
 @@ -26,12 +26,14 @@
  
  if TEXLIVE_BUILD
@@ -26,32 +13,41 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.a
  	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
  	@for f in $(scripts); do \
 -	  $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
-+	  $(INSTALL_SCRIPT) "$$f" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
++	  $(INSTALL_SCRIPT) $$f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
  	done
  	case "$(bindir)" in \
  	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-@@ -57,17 +59,9 @@
+@@ -53,17 +55,23 @@
+ 	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
+ 	done
+ 
++sed_cmd = sed -e 's:@is_TL\@:yes:'
++
+ else !TEXLIVE_BUILD
  
  bin_SCRIPTS += $(scripts)
  
--texindy: texindy.in Makefile
++sed_cmd = sed -e 's:@libdir\@:$(libdir):'
++
++endif !TEXLIVE_BUILD
++
+ texindy: texindy.in Makefile
 -	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
--
--xindy: xindy.in Makefile
++	$(sed_cmd) $(srcdir)/$@.in >$@
++	chmod +x $@
+ 
+ xindy: xindy.in Makefile
 -	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
 -
- endif !TEXLIVE_BUILD
+-endif !TEXLIVE_BUILD
++	$(sed_cmd) $(srcdir)/$@.in >$@
++	chmod +x $@
  
  man_MANS = texindy.1 xindy.1
  
--EXTRA_DIST = $(man_MANS) texindy.in xindy.in
--
--CLEANFILES = $(scripts)
-+EXTRA_DIST = $(man_MANS)
- 
-diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/texindy.in xindy/user-commands/texindy.in
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/texindy.in xindy/user-commands/texindy.in
 --- xindy.orig/user-commands/texindy.in	2010-05-11 01:39:24.000000000 +0200
-+++ xindy/user-commands/texindy.in	2010-05-12 11:09:38.891995103 +0200
++++ xindy/user-commands/texindy.in	2010-05-12 11:09:39.000000000 +0200
 @@ -352,6 +352,7 @@
  
  # Determine environment. Where is our library directory, and our modules?
@@ -76,9 +72,9 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/texindy.in
  
      if ( $is_w32 ) {
  	$xindy = "$cmd_dir/xindy.pl";
-diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in
 --- xindy.orig/user-commands/xindy.in	2010-05-11 01:39:24.000000000 +0200
-+++ xindy/user-commands/xindy.in	2010-05-12 11:09:37.247697554 +0200
++++ xindy/user-commands/xindy.in	2010-05-12 11:09:37.000000000 +0200
 @@ -337,6 +337,7 @@
  
  # Determine environment. Where is our library directory, and our modules?
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg
index 52957937477..65841905cd4 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg
@@ -15,7 +15,7 @@
 	Drop unused files (from TL2008 and more).
 
 diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefile.am.not-yet xindy/make-rules/alphabets/Makefile.am.not-yet
---- xindy.orig/make-rules/alphabets/Makefile.am.not-yet	2010-05-11 14:17:41.383930125 +0200
+--- xindy.orig/make-rules/alphabets/Makefile.am.not-yet	1970-01-01 01:00:00.000000000 +0100
 +++ xindy/make-rules/alphabets/Makefile.am.not-yet	2010-01-13 13:01:37.000000000 +0100
 @@ -0,0 +1,310 @@
 +## Use `autoreconf' in top-level directory to recreate all
@@ -329,7 +329,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
 +CLEANFILES += $(nobase_nodist_lang_DATA) $(DOCS) $(DOC_CLEAN)
 +
 diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lang.defs xindy/make-rules/alphabets/lang.defs
---- xindy.orig/make-rules/alphabets/lang.defs	2010-05-11 14:17:41.383930125 +0200
+--- xindy.orig/make-rules/alphabets/lang.defs	1970-01-01 01:00:00.000000000 +0100
 +++ xindy/make-rules/alphabets/lang.defs	2010-01-10 22:08:23.000000000 +0100
 @@ -0,0 +1,45 @@
 +albanian UTF8_LAT LATIN1
@@ -378,7 +378,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lang.d
 +ukrainian UTF8_CYR CYR_KOI8_U CYR_1251
 +vietnamese UTF8_LAT
 diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/mk-lang.sh xindy/make-rules/alphabets/mk-lang.sh
---- xindy.orig/make-rules/alphabets/mk-lang.sh	2010-05-11 14:17:41.383930125 +0200
+--- xindy.orig/make-rules/alphabets/mk-lang.sh	1970-01-01 01:00:00.000000000 +0100
 +++ xindy/make-rules/alphabets/mk-lang.sh	2010-01-13 13:51:57.000000000 +0100
 @@ -0,0 +1,213 @@
 +#! /bin/sh
diff --git a/Build/source/utils/xindy/xindy/Makefile.in b/Build/source/utils/xindy/xindy/Makefile.in
index b3ce279e69b..7c6b1470bf6 100644
--- a/Build/source/utils/xindy/xindy/Makefile.in
+++ b/Build/source/utils/xindy/xindy/Makefile.in
@@ -205,7 +205,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/configure.ac b/Build/source/utils/xindy/xindy/configure.ac
index fd6bc130fa6..b4ab8a0c8a7 100644
--- a/Build/source/utils/xindy/xindy/configure.ac
+++ b/Build/source/utils/xindy/xindy/configure.ac
@@ -162,9 +162,4 @@ AC_CONFIG_FILES([Makefile \
 	    	doc/style-tutorial/Makefile
 ])
 
-# In a TeX Live build enable_texlive_build is yes, otherwise undefined.
-AC_SUBST([is_TL], ["$enable_texlive_build"])
-AC_CONFIG_FILES([user-commands/texindy], [chmod +x user-commands/texindy])
-AC_CONFIG_FILES([user-commands/xindy], [chmod +x user-commands/xindy])
-
 AC_OUTPUT
diff --git a/Build/source/utils/xindy/xindy/doc/Makefile.in b/Build/source/utils/xindy/xindy/doc/Makefile.in
index 7e0cb870853..b53fc03c52a 100644
--- a/Build/source/utils/xindy/xindy/doc/Makefile.in
+++ b/Build/source/utils/xindy/xindy/doc/Makefile.in
@@ -196,7 +196,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in
index 8aa0aa32770..fe0c6129b38 100644
--- a/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/Makefile.in
index 92c2d18d4f1..5908b31b3f1 100644
--- a/Build/source/utils/xindy/xindy/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/Makefile.in
@@ -172,7 +172,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in
index 7a4d8d92507..849fc191c56 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in
@@ -239,7 +239,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in
index 42990435e0d..f5fd60dbfbe 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in
index 13a457ac29e..a9c51064805 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in
index cc74e23984c..eb6c84e4a2a 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in
index 24bf446992a..deedff78dc0 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in
index 36010c592ef..f38707a255b 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in
index 2627af055f6..40a48b600bc 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in
index 48b4e568215..9af1c097c65 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in
index 200f02029af..aad9c46129f 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in
index 973fa17d09d..669e1875d16 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in
index 800aebc9381..5b8bfeb5130 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in
index 47a74e93503..36d15904aff 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in
index 1d378d0dd8e..bcc5defa372 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in
index 06963fc58d9..6cffa109650 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in
index d310a627ab1..48c1d24be91 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in
index abba2ae58fb..b7c7e25ad53 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in
index 5005ce4d9ef..935e3244e29 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in
index 76fe4aabe3d..bd22bd7bdaa 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in
index 4cae0d1b473..a1fa738dc9e 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in
index d03a20a8ae7..73538ec2fb5 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in
index 4d72934fa14..20a71258b1f 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in
index 90708e1cc86..2776932819b 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in
index 511830a00c6..1aa018b5018 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in
index b6614231378..d2ac96e73ca 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in
index d340dee5af4..8ade34a01d7 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in
index 9a1f47ba73f..0dc10db7305 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in
index 1086efa7710..46e2c0c986b 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in
index a0c168fd984..f8afb7caf21 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
index b9e20145a85..dd6a0747e8a 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in
index 87e338c395d..5ad46da70d4 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in
index 68cde62947c..ca8f3aa55b5 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in
index a272e32a60c..2e87fc7b555 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in
index 9626fa85a59..c2bcab82d0b 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in
index 27e153fdafd..47f58d97f39 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in
index 921e69f2edf..9c3427d018b 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in
index 30ea56ae728..aa2eed0e390 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in
index ec3ec214716..c1868afac7d 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in
index c42577a08f8..e36fead24bd 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in
index 6e76b874f93..25b5a075da6 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in
index ea309bb371b..07468b99013 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in
index 547870fa840..8682f0c74da 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in
index 3ea64ddf124..d6440e2b373 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in
index 5f0fe8a6c17..11913af0221 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in
index 2d501388f74..8f92ca22804 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
index 8833bc510c0..d9de7f3efa5 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in
index 16371493825..8c0c671ef20 100644
--- a/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in
@@ -132,7 +132,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in
index 632a4e1b54d..cc5f7bbccd4 100644
--- a/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in
index 0aa93e4c462..72f1251175e 100644
--- a/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/Makefile.in b/Build/source/utils/xindy/xindy/modules/Makefile.in
index 9cbe1581004..dc6768d4259 100644
--- a/Build/source/utils/xindy/xindy/modules/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/Makefile.in
@@ -172,7 +172,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/xindy/modules/base/Makefile.in
index ec0c89af9e5..605c6bc801a 100644
--- a/Build/source/utils/xindy/xindy/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/base/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/xindy/modules/class/Makefile.in
index f113290e082..5d0ffd0edd8 100644
--- a/Build/source/utils/xindy/xindy/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/class/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/xindy/modules/lang/Makefile.in
index 125383cac1c..933dd3dd25d 100644
--- a/Build/source/utils/xindy/xindy/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/lang/Makefile.in
@@ -172,7 +172,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in
index 70f181c7771..04b25f1209a 100644
--- a/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in
index 5643f640fbc..41d2a274bea 100644
--- a/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/xindy/modules/ord/Makefile.in
index ba0310516c6..4c487763592 100644
--- a/Build/source/utils/xindy/xindy/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/ord/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/xindy/modules/rules/Makefile.in
index 65762417e57..52088f956ea 100644
--- a/Build/source/utils/xindy/xindy/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/rules/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/xindy/modules/styles/Makefile.in
index efaac54a7fc..c99e0fe81e3 100644
--- a/Build/source/utils/xindy/xindy/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/xindy/modules/styles/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/src/Makefile.in b/Build/source/utils/xindy/xindy/src/Makefile.in
index cf7ffd19995..8cd29769801 100644
--- a/Build/source/utils/xindy/xindy/src/Makefile.in
+++ b/Build/source/utils/xindy/xindy/src/Makefile.in
@@ -156,7 +156,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in
index dbb88d850c7..fee495227d3 100644
--- a/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in
@@ -176,7 +176,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/Build/source/utils/xindy/xindy/user-commands/Makefile.am b/Build/source/utils/xindy/xindy/user-commands/Makefile.am
index 38cbe3349ec..f0cb65ca936 100644
--- a/Build/source/utils/xindy/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy/xindy/user-commands/Makefile.am
@@ -33,7 +33,7 @@ scriptsdir = ${prefix}/$(scriptspath)
 install-exec-hook:
 	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 	@for f in $(scripts); do \
-	  $(INSTALL_SCRIPT) "$$f" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
+	  $(INSTALL_SCRIPT) $$f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
 	done
 	case "$(bindir)" in \
 	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
@@ -55,13 +55,27 @@ uninstall-hook:
 	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
 	done
 
+sed_cmd = sed -e 's:@is_TL\@:yes:'
+
 else !TEXLIVE_BUILD
 
 bin_SCRIPTS += $(scripts)
 
+sed_cmd = sed -e 's:@libdir\@:$(libdir):'
+
 endif !TEXLIVE_BUILD
 
+texindy: texindy.in Makefile
+	$(sed_cmd) $(srcdir)/$@.in >$@
+	chmod +x $@
+
+xindy: xindy.in Makefile
+	$(sed_cmd) $(srcdir)/$@.in >$@
+	chmod +x $@
+
 man_MANS = texindy.1 xindy.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) texindy.in xindy.in
+
+CLEANFILES = $(scripts)
 
diff --git a/Build/source/utils/xindy/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/xindy/user-commands/Makefile.in
index ee6a2139f1e..716c0086621 100644
--- a/Build/source/utils/xindy/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/xindy/user-commands/Makefile.in
@@ -35,8 +35,7 @@ build_triplet = @build@
 host_triplet = @host@
 @TEXLIVE_BUILD_FALSE@am__append_1 = $(scripts)
 subdir = xindy/user-commands
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/texindy.in $(srcdir)/xindy.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
@@ -44,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = texindy xindy
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -161,7 +160,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-is_TL = @is_TL@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -187,8 +185,11 @@ bin_SCRIPTS = $(am__append_1)
 @TEXLIVE_BUILD_TRUE@noinst_SCRIPTS = $(scripts)
 @TEXLIVE_BUILD_TRUE@scriptspath = texmf/scripts/xindy
 @TEXLIVE_BUILD_TRUE@scriptsdir = ${prefix}/$(scriptspath)
+@TEXLIVE_BUILD_FALSE@sed_cmd = sed -e 's:@libdir\@:$(libdir):'
+@TEXLIVE_BUILD_TRUE@sed_cmd = sed -e 's:@is_TL\@:yes:'
 man_MANS = texindy.1 xindy.1
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) texindy.in xindy.in
+CLEANFILES = $(scripts)
 all: all-am
 
 .SUFFIXES:
@@ -222,10 +223,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-texindy: $(top_builddir)/config.status $(srcdir)/texindy.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-xindy: $(top_builddir)/config.status $(srcdir)/xindy.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -372,6 +369,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -470,7 +468,7 @@ uninstall-man: uninstall-man1
 @TEXLIVE_BUILD_TRUE@install-exec-hook:
 @TEXLIVE_BUILD_TRUE@	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
 @TEXLIVE_BUILD_TRUE@	@for f in $(scripts); do \
-@TEXLIVE_BUILD_TRUE@	  $(INSTALL_SCRIPT) "$$f" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
+@TEXLIVE_BUILD_TRUE@	  $(INSTALL_SCRIPT) $$f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
 @TEXLIVE_BUILD_TRUE@	done
 @TEXLIVE_BUILD_TRUE@	case "$(bindir)" in \
 @TEXLIVE_BUILD_TRUE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
@@ -492,6 +490,14 @@ uninstall-man: uninstall-man1
 @TEXLIVE_BUILD_TRUE@	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
 @TEXLIVE_BUILD_TRUE@	done
 
+texindy: texindy.in Makefile
+	$(sed_cmd) $(srcdir)/$@.in >$@
+	chmod +x $@
+
+xindy: xindy.in Makefile
+	$(sed_cmd) $(srcdir)/$@.in >$@
+	chmod +x $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: