xindy-2.4-pre2 update

git-svn-id: svn://tug.org/texlive/trunk@16278 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2009-12-03 12:07:46 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2009-12-03 12:07:46 +0000
commit: 86fab6d87ab71745fb879828db94aad36ccb4e0c (patch)
tree: bbbf42f3f4b5912cd14bb950a219b23685a5e420 /Build
parent: e3c587eb81f9a6d1c68694ae040791c2bd69cd3e (diff)
96 files changed, 995 insertions, 1576 deletions
diff --git a/Build/source/utils/xindy-new/ChangeLog b/Build/source/utils/xindy-new/ChangeLog
index 7fce3d17b55..e8c0067cb72 100644
--- a/Build/source/utils/xindy-new/ChangeLog
+++ b/Build/source/utils/xindy-new/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported http://www.xindy.org/xindy-2.4-pre2.tar.gz.
+	* xindy-2.4-rc1-PATCHES/ renamed to xindy-2.4-pre2-PATCHES/.
+
 2009-11-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported xindy-2.4-rc1.
diff --git a/Build/source/utils/xindy-new/Makefile.in b/Build/source/utils/xindy-new/Makefile.in
index f30e5cd6d0b..82994bb6a7a 100644
--- a/Build/source/utils/xindy-new/Makefile.in
+++ b/Build/source/utils/xindy-new/Makefile.in
@@ -30,8 +30,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 DIST_COMMON = $(am__configure_deps) \
+	$(srcdir)/../../build-aux/config.guess \
+	$(srcdir)/../../build-aux/config.sub \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/missing \
 	$(srcdir)/../../build-aux/mkinstalldirs $(srcdir)/Makefile.am \
@@ -169,14 +173,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/configure b/Build/source/utils/xindy-new/configure
index 5961a9e4810..5225a1986b7 100755
--- a/Build/source/utils/xindy-new/configure
+++ b/Build/source/utils/xindy-new/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for xindy for TeX Live 2.4-rc1.
+# Generated by GNU Autoconf 2.65 for xindy for TeX Live 2.4-pre2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -551,8 +551,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xindy for TeX Live'
 PACKAGE_TARNAME='xindy-for-tex-live'
-PACKAGE_VERSION='2.4-rc1'
-PACKAGE_STRING='xindy for TeX Live 2.4-rc1'
+PACKAGE_VERSION='2.4-pre2'
+PACKAGE_STRING='xindy for TeX Live 2.4-pre2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -571,6 +571,14 @@ LATEX
 PERL
 CLISP
 WARNING_CFLAGS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 LN_S
 LEXLIB
 LEX_OUTPUT_ROOT
@@ -1219,7 +1227,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xindy for TeX Live 2.4-rc1 to adapt to many kinds of systems.
+\`configure' configures xindy for TeX Live 2.4-pre2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1281,12 +1289,16 @@ Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xindy for TeX Live 2.4-rc1:";;
+     short | recursive ) echo "Configuration of xindy for TeX Live 2.4-pre2:";;
    esac
   cat <<\_ACEOF
 
@@ -1387,7 +1399,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xindy for TeX Live configure 2.4-rc1
+xindy for TeX Live configure 2.4-pre2
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1555,7 +1567,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xindy for TeX Live $as_me 2.4-rc1, which was
+It was created by xindy for TeX Live $as_me 2.4-pre2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2366,7 +2378,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xindy-for-tex-live'
- VERSION='2.4-rc1'
+ VERSION='2.4-pre2'
 
 
 # Some tools Automake needs.
@@ -3631,6 +3643,79 @@ $as_echo "no, using $LN_S" >&6; }
 fi
 
 
+# Check system type
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
 # Check whether --enable-compiler-warnings was given.
 if test "${enable_compiler_warnings+set}" = set; then :
   enableval=$enable_compiler_warnings;
@@ -4548,7 +4633,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xindy for TeX Live $as_me 2.4-rc1, which was
+This file was extended by xindy for TeX Live $as_me 2.4-pre2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4605,7 +4690,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xindy for TeX Live config.status 2.4-rc1
+xindy for TeX Live config.status 2.4-pre2
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/xindy-new/configure.ac b/Build/source/utils/xindy-new/configure.ac
index af4255d7415..0f15bbb5c12 100644
--- a/Build/source/utils/xindy-new/configure.ac
+++ b/Build/source/utils/xindy-new/configure.ac
@@ -56,6 +56,9 @@ AC_PROG_CC
 AC_PROG_LEX
 AC_PROG_LN_S
 
+# Check system type
+AC_CANONICAL_HOST
+
 KPSE_COMPILER_WARNINGS
 
 AC_CHECK_PROGS([CLISP], [clisp], [no])
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/ChangeLog b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
index 1c3fd060e0e..b8223f90eb3 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
@@ -1,6 +1,12 @@
-2009-12-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+2009-12-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
+	Imported xindy-2.4-pre2 source tree from:
+	  http://www.xindy.org/xindy-2.4-pre2.tar.gz.
+	* patch-0?-*, patch-11-parallel: Removed; have been integrated
+	into xindy-2.4-pre2.
+	* patch-20-TL-install-dirs, patch-30-warnings: Adjusted.
 	* patch-12-parallel (new): More parallel build problems.
+	* patch-13-gzip (new): Do not gzip xindy.mem for Win32.
 
 2009-11-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/TL-Changes b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
index 7875dc911ac..fdd3a84ed76 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/TL-Changes
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
 Changes applied to the xindy source tree as obtained from:
-	http://www.xindy.org/xindy-2.4-SNAPSHOT.tar.gz
+	http://www.xindy.org/xindy-2.4-pre2.tar.gz
 
 Removed:
 	aclocal.m4
@@ -8,6 +8,7 @@ Removed:
 	configure
 	depcomp
 	install-sh
+	make-dist
 	missing
 	ylwrap
 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-12-parallel b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-12-parallel
new file mode 100644
index 00000000000..2874720b9f7
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-12-parallel
@@ -0,0 +1,50 @@
+	More problems with aggressive parallel builds (make -j).
+
+	The three rules:
+		%-test.xdy : %.pl
+			$(PERL) -I$(srcdir) $< $*
+		%-doc.tex : %.pl
+			$(PERL) -I$(srcdir) $< $*
+		%.xdy :	%.pl
+			$(PERL) -I$(srcdir) $< $*
+	must not run simultaneously or %-test.xdy could be destroyed.
+
+diff -ur -x Makefile.in xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
+--- xindy.orig/make-rules/alphabets/Makefile.am	2009-12-03 01:45:51.000000000 +0100
++++ xindy/make-rules/alphabets/Makefile.am	2009-12-02 20:34:28.000000000 +0100
+@@ -892,14 +892,24 @@
+ %-lang.xdy : %-test.xdy
+ 	sed -n '1,10 p' <$< >$@
+ 
++# Running "$(PERL) -I$(srcdir) $< $*" creates %-test.xdy, %-doc.tex, %.raw,
++# and %.xdy; %-test.xdy is finished first.  We must not run this command
++# several times simultaneously (for details see Automake manual 27.9).
+ %-test.xdy : %.pl
+ 	$(PERL) -I$(srcdir) $< $*
+ 
+-%-doc.tex : %.pl
+-	$(PERL) -I$(srcdir) $< $*
+-
+-%.xdy :	%.pl
+-	$(PERL) -I$(srcdir) $< $*
++%-doc.tex %.xdy : %-test.xdy
++	@if test -f $@; then :; else \
++	  trap 'rm -rf $*.lock $<' 1 2 13 15; \
++	  if mkdir $*.lock 2>/dev/null; then \
++	    rm -f $<; \
++	    $(MAKE) $(AM_MAKEFLAGS) $<; \
++	    result=$$?; rm -rf $*.lock; exit $$result; \
++	  else \
++	    while test -d $*.lock; do sleep 1; done; \
++	    test -f $<; \
++	  fi; \
++	fi
+ 
+ SUBDIRS = \
+ 	albanian \
+@@ -1264,5 +1274,3 @@
+ 
+ CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
+ 
+-.NOTPARALLEL:
+-
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-13-gzip b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-13-gzip
new file mode 100644
index 00000000000..3346a8f5bd1
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-13-gzip
@@ -0,0 +1,42 @@
+diff -ur -x Makefile.in xindy.orig/configure.ac xindy/configure.ac
+--- xindy.orig/configure.ac	2009-12-03 01:34:16.000000000 +0100
++++ xindy/configure.ac	2009-12-03 11:52:02.000000000 +0100
+@@ -57,6 +57,9 @@
+ AC_PROG_LEX
+ AC_PROG_CC
+ 
++# Check system type
++AC_CANONICAL_HOST
++
+ # On some systems without working iconv, we must use recode.
+ AC_ARG_WITH([xindy-recode],
+             AS_HELP_STRING([--with-xindy-recode],
+@@ -79,12 +82,6 @@
+ # No checks for header files. We use stdio.h, unistd.h, and string.h.
+ # Today, they are universally available if a C compiler is installed.
+ 
+-dnl # Check system type
+-dnl # FIXME: Is that needed for TeX Live compilation? Leave it in comments...
+-dnl AC_CANONICAL_HOST
+-dnl AC_SUBST(host_cpu)
+-dnl AC_SUBST(host_os)
+-
+ # Checks for typedefs, structures, and compiler characteristics.
+ 
+ # Checks for library functions.
+diff -ur -x Makefile.in xindy.orig/src/Makefile.am xindy/src/Makefile.am
+--- xindy.orig/src/Makefile.am	2009-12-03 01:38:20.000000000 +0100
++++ xindy/src/Makefile.am	2009-12-03 11:53:59.000000000 +0100
+@@ -46,8 +46,10 @@
+ xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
+ 	rm -f $(MEMFILE)
+ 	$(CLISP) $(srcdir)/$(DUMP_XINDY)
+-	gzip $(MEMFILE)
+-	mv $(MEMFILE).gz $(MEMFILE)
++	if test "$(host_os)" != "mingw32"; then \
++	  gzip -9n $@; \
++	  mv $@.gz $@; \
++	fi
+ 
+ $(DEFAULTS): $(DEFAULTS).in Makefile
+ 	sed 's|@MODULEDIR[@]|$(MODULEDIR)|g' <$(srcdir)/$(DEFAULTS).in >$(DEFAULTS)
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-20-TL-install-dirs b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-20-TL-install-dirs
index a4e3bc0736a..5ffca247260 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-20-TL-install-dirs
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-20-TL-install-dirs
@@ -1,11 +1,11 @@
 	Installation paths for TL and standalone builds.
 
-	ToDo: determination of libdir and moduledir in the
-	texindy, xindy, and xindy.v2 perl script.
+	ToDo:
+	Determination of libdir and moduledir in the xindy perl script.
 
 diff -ur -x Makefile.in xindy.orig/configure.ac xindy/configure.ac
---- xindy.orig/configure.ac	2009-11-26 20:34:35.000000000 +0100
-+++ xindy/configure.ac	2009-11-29 20:47:57.000000000 +0100
+--- xindy.orig/configure.ac	2009-12-03 11:52:02.000000000 +0100
++++ xindy/configure.ac	2009-12-03 11:59:47.000000000 +0100
 @@ -35,6 +35,11 @@
  # programs, automake's defaults are not usable for us, too.
  AM_INIT_AUTOMAKE([foreign no-define])
@@ -24,32 +24,32 @@ diff -ur -x Makefile.in xindy.orig/configure.ac xindy/configure.ac
  AC_PROG_CC
 +AC_PROG_LN_S
  
- # On some systems without working iconv, we must use recode.
- AC_ARG_WITH([xindy-recode],
+ # Check system type
+ AC_CANONICAL_HOST
 diff -ur -x Makefile.in xindy.orig/src/Makefile.am xindy/src/Makefile.am
---- xindy.orig/src/Makefile.am	2009-11-29 17:39:57.000000000 +0100
-+++ xindy/src/Makefile.am	2009-11-29 17:44:05.000000000 +0100
+--- xindy.orig/src/Makefile.am	2009-12-03 11:53:59.000000000 +0100
++++ xindy/src/Makefile.am	2009-12-03 12:00:48.000000000 +0100
 @@ -26,7 +26,7 @@
- # Since automake has no CLISP support, we need to explicitly add make
- # rules to create the xindy kernel below and stop automake from
- # looking for C sources.
+ 
+ # Automake has no CLISP support; moreover xindy.mem is not a binary
+ # to be stripped upon 'make install-strip'.  We define it as DATA.
 -pkglib_DATA = xindy.mem
 +mem_DATA = xindy.mem
  
  # Tell the dist target about our sources, define the object files for
  # our own rule and the .lib files for the clean definition. Don't use
 diff -ur -x Makefile.in xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
---- xindy.orig/user-commands/Makefile.am	2009-11-25 14:00:59.000000000 +0100
-+++ xindy/user-commands/Makefile.am	2009-12-02 16:55:04.000000000 +0100
+--- xindy.orig/user-commands/Makefile.am	2009-12-03 01:31:28.000000000 +0100
++++ xindy/user-commands/Makefile.am	2009-12-03 11:59:47.000000000 +0100
 @@ -20,7 +20,39 @@
  ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  ## Boston, MA 02110-1301 USA.
  
 -bin_SCRIPTS = texindy xindy xindy.v2
-+bin_SCRIPTS =
-+scripts = texindy xindy xindy.v2
++scripts = texindy xindy
 +
 +if TEXLIVE_BUILD
++bin_SCRIPTS =
 +noinst_SCRIPTS = $(scripts)
 +scriptspath = texmf/scripts/xindy
 +scriptsdir = ${prefix}/$(scriptspath)
@@ -77,7 +77,7 @@ diff -ur -x Makefile.in xindy.orig/user-commands/Makefile.am xindy/user-commands
 +	  rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \
 +	done
 +else !TEXLIVE_BUILD
-+bin_SCRIPTS += $(scripts)
++bin_SCRIPTS = $(scripts) xindy.v2
 +endif !TEXLIVE_BUILD
  
  xindy: xindy.in Makefile
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-30-warnings b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-30-warnings
new file mode 100644
index 00000000000..67393936810
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-30-warnings
@@ -0,0 +1,26 @@
+	Use ANSI C function definitions.
+
+diff -ur -x Makefile.in xindy.orig/tex2xindy/tex2xindy.c xindy/tex2xindy/tex2xindy.c
+--- xindy.orig/tex2xindy/tex2xindy.c	2009-12-03 01:54:58.000000000 +0100
++++ xindy/tex2xindy/tex2xindy.c	2009-12-03 11:44:54.000000000 +0100
+@@ -2311,7 +2311,7 @@
+ 
+ 
+ 
+-static void usage ()
++static void usage (void)
+ {
+     fputs("This is tex2xindy, $Revision: 1.23 $.\n", stderr);
+     fputs("usage: tex2xindy [-o] [attr_file]\n", stderr);
+diff -ur -x Makefile.in xindy.orig/tex2xindy/tex2xindy.l xindy/tex2xindy/tex2xindy.l
+--- xindy.orig/tex2xindy/tex2xindy.l	2009-12-03 01:42:14.000000000 +0100
++++ xindy/tex2xindy/tex2xindy.l	2009-12-03 11:44:39.000000000 +0100
+@@ -362,7 +362,7 @@
+ 
+ %%
+ 
+-static void usage ()
++static void usage (void)
+ {
+     fputs("This is tex2xindy, $Revision: 1.23 $.\n", stderr);
+     fputs("usage: tex2xindy [-o] [attr_file]\n", stderr);
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-01-VPATH-and-more b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-01-VPATH-and-more
deleted file mode 100644
index 5fece359c51..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-01-VPATH-and-more
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
---- xindy.orig/make-rules/alphabets/Makefile.am	2009-03-29 12:44:00.000000000 +0200
-+++ xindy/make-rules/alphabets/Makefile.am	2009-11-21 00:21:54.000000000 +0100
-@@ -133,7 +133,6 @@
- 	dutch/ij-as-ij-utf8-test.xdy \
- 	dutch/ij-as-ij-utf8.xdy \
- 	dutch/ij-as-y-utf8.pl \
--	dutch/ij-as-y-utf8.xdy \
- 	dutch/ij-as-y-utf8-lang.xdy \
- 	dutch/ij-as-y-utf8-test.xdy \
- 	dutch/ij-as-y-utf8.xdy
-@@ -729,7 +728,7 @@
- 	iconv -f UTF-8 -t CP850 >$@
- 
- romanian/latin2.pl : romanian/utf8.pl
--	sed -e 's/@u{\([^}]*\)}//g;' -f rom-comma-kludge.sed <$< | \
-+	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
- 	iconv -f UTF-8 -t ISO8859-2 >$@
- 
- %latin2.pl : %utf8.pl.in
-@@ -765,7 +764,7 @@
- 	iconv -f UTF-8 -t ISO-8859-15 >$@
- 
- romanian/cp1250.pl : romanian/utf8.pl
--	sed -e 's/@u{\([^}]*\)}//g;' -f rom-comma-kludge.sed <$< | \
-+	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
- 	iconv -f UTF-8 -t CP1250 >$@
- 
- %cp1250.pl : %utf8.pl.in
-@@ -793,7 +792,7 @@
- 	iconv -f UTF-8 -t KOI8-U >$@
- 
- # %tex.pl : %utf8.pl utf8-to-tex.sed
--#	sed -f utf8-to-tex.sed <$< >$@
-+#	sed -f $(srcdir)/utf8-to-tex.sed <$< >$@
- 
- 
- 
-@@ -801,13 +800,13 @@
- 	sed -n '1,10 p' <$< >$@
- 
- %-test.xdy : %.pl
--	perl $< $*
-+	perl -I$(srcdir) $< $*
- 
- %-doc.tex : %.pl
--	perl $< $*
-+	perl -I$(srcdir) $< $*
- 
- %.xdy :	%.pl
--	perl $< $*
-+	perl -I$(srcdir) $< $*
- 
- SUBDIRS = \
- 	albanian \
-@@ -1149,8 +1148,8 @@
- 
- if BUILDDOCS
- alphabets-doc.pdf : alphabets-doc.tex alphabets-inc.tex
--	pdflatex -interaction batchmode alphabets-doc.tex
--	pdflatex -interaction batchmode alphabets-doc.tex
-+	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
-+	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
- 
- PDFS = alphabets-doc.pdf
- 
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/inputenc/Makefile.am xindy/make-rules/inputenc/Makefile.am
---- xindy.orig/make-rules/inputenc/Makefile.am	2008-02-17 16:03:56.000000000 +0100
-+++ xindy/make-rules/inputenc/Makefile.am	2009-11-21 00:26:12.000000000 +0100
-@@ -46,9 +46,9 @@
- 	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
- 
- %.xdy %.idx :
--	perl ./make-testidx.pl TS1,T2A,T1 $* >$*.tex
-+	perl $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex
- 	latex -interaction batchmode $*.tex
--	perl ./make-inp-rules.pl <$*.idx >$*.xdy
-+	perl $(srcdir)/make-inp-rules.pl <$*.idx >$*.xdy
- 
- PERLSCRIPTS = \
- 	make-inp-rules.pl \
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/src/Makefile.am xindy/src/Makefile.am
---- xindy.orig/src/Makefile.am	2009-03-29 17:24:27.000000000 +0200
-+++ xindy/src/Makefile.am	2009-11-20 23:59:25.000000000 +0100
-@@ -30,13 +30,12 @@
- # Since automake has no CLISP support, we need to explicitly add make
- # rules to create the xindy kernel below and stop automake from
- # looking for C sources.
--pkglib_PROGRAMS = xindy.mem
--xindy_mem_SOURCES =
-+pkglib_DATA = xindy.mem
- 
- # Tell the dist target about our sources, define the object files for
- # our own rule and the .lib files for the clean definition. Don't use
- # gmake-isms.
--dist_xindy_mem_SOURCES = base.lsp ordrules.lsp locref.lsp idxstyle.lsp \
-+dist_xindy_mem_sources = base.lsp ordrules.lsp locref.lsp idxstyle.lsp \
- 			 index.lsp version.lsp markup.lsp
- FAS                    = base.fas ordrules.fas locref.fas idxstyle.fas \
- 			 index.fas version.fas markup.fas
-@@ -50,18 +49,18 @@
- 
- xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
- 	rm -f $(MEMFILE)
--	$(CLISP) $(DUMP_XINDY)
-+	$(CLISP) $(srcdir)/$(DUMP_XINDY)
- 	gzip $(MEMFILE)
- 	mv $(MEMFILE).gz $(MEMFILE)
- 
- $(DEFAULTS): $(DEFAULTS).in Makefile
--	sed 's|@MODULEDIR[@]|$(MODULEDIR)|g' <$(DEFAULTS).in >$(DEFAULTS)
-+	sed 's|@MODULEDIR[@]|$(MODULEDIR)|g' <$(srcdir)/$(DEFAULTS).in >$(DEFAULTS)
- 
--EXTRA_DIST = $(DEFAULTS).in
-+EXTRA_DIST = $(DEFAULTS).in $(dist_xindy_mem_sources)
- 
- SUFFIXES = .fas .lsp
- .lsp.fas:
--	$(CLISP) -c $<
-+	$(CLISP) -c $< -o $@
- 
- 
- CLEANFILES = $(FAS) $(FASLIBS) $(DEFAULTS)
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
---- xindy.orig/user-commands/Makefile.am	2009-03-29 13:16:52.000000000 +0200
-+++ xindy/user-commands/Makefile.am	2009-11-20 23:12:03.000000000 +0100
-@@ -23,11 +23,11 @@
- bin_SCRIPTS = texindy xindy xindy.v2
- 
- xindy: xindy.in Makefile
--	sed -e 's:@libdir\@:$(libdir):' xindy.in >xindy
-+	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
- 
- # FIXME: Should get Perl location from autoconf
- xindy.v2: xindy.v2.in
--	sed -e 's:@XINDY_PERL\@:/usr/bin/perl:' xindy.v2.in >xindy.v2
-+	sed -e 's:@XINDY_PERL\@:/usr/bin/perl:' $(srcdir)/xindy.v2.in >xindy.v2
- 
- man_MANS = texindy.1 xindy.1 xindy.v2.1
- 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-02-VPATH-in-perl b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-02-VPATH-in-perl
deleted file mode 100644
index 317be53c0e8..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-02-VPATH-in-perl
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/alphabets/make-rules.pl xindy/make-rules/alphabets/make-rules.pl
---- xindy.orig/make-rules/alphabets/make-rules.pl	2009-03-26 01:04:22.000000000 +0100
-+++ xindy/make-rules/alphabets/make-rules.pl	2009-11-23 23:12:55.000000000 +0100
-@@ -23,7 +23,8 @@
- print TESTXDY "(use-rule-set :run 3\n";
- print TESTXDY "	      :rule-set (\"".$prefix."resolve-special\"))\n";
- close TESTXDY;
--system("cat test.xdy >> $ARGV[0]-test.xdy");
-+$fn = "test.xdy"; $fn = "$INC[0]/$fn" if ! -f $fn && -f "$INC[0]/$fn"; die "$fn: $!" if ! -f $fn;
-+system("cat $fn >> $ARGV[0]-test.xdy");
- 
- $begin = 128;
- # $begin =  97 if ($script eq "cyrillic");
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-03-iconv-or-recode b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-03-iconv-or-recode
deleted file mode 100644
index e1b286660e2..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-03-iconv-or-recode
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/configure.ac xindy/configure.ac
---- xindy.orig/configure.ac	2009-03-29 14:24:33.000000000 +0200
-+++ xindy/configure.ac	2009-11-23 23:13:08.000000000 +0100
-@@ -56,6 +56,20 @@
- AM_PROG_LEX
- AC_PROG_CC
- 
-+# On some systems without working iconv, we must use recode.
-+AC_ARG_WITH([xindy-recode],
-+            AS_HELP_STRING([--with-xindy-recode],
-+                           [Use `recode' instead of `iconv' @<:@default is NO@:>@]))
-+if test "x$with_xindy_recode" != xyes; then
-+  CONVERT_FROM_UTF8='iconv -f UTF-8 -t #' # May need the trailing blank
-+else
-+  AC_CHECK_PROG(CONVERT_FROM_UTF8, recode, [recode UTF-8..])
-+  if test "x$CONVERT_FROM_UTF8" != 'xrecode UTF-8..'; then
-+    AC_MSG_ERROR([--with-xindy-recode specified, but `recode' not found])
-+  fi
-+fi
-+AC_SUBST([CONVERT_FROM_UTF8])
-+
- # Check that CLISP was found.
- # FIXME: Should we also check for latex in the buildrules case?
- # What about a C compiler? install?
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
---- xindy.orig/make-rules/alphabets/Makefile.am	2009-11-21 00:21:54.000000000 +0100
-+++ xindy/make-rules/alphabets/Makefile.am	2009-11-23 22:36:01.000000000 +0100
-@@ -721,75 +721,75 @@
- 
- %latin1.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO8859-1 >$@
-+	$(CONVERT_FROM_UTF8)ISO8859-1 >$@
- 
- %cp850.pl : %utf8.pl.in
- 	sed -e 's/@.{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t CP850 >$@
-+	$(CONVERT_FROM_UTF8)CP850 >$@
- 
- romanian/latin2.pl : romanian/utf8.pl
- 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
--	iconv -f UTF-8 -t ISO8859-2 >$@
-+	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
- 
- %latin2.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO8859-2 >$@
-+	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
- 
- %latin3.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO8859-3 >$@
-+	$(CONVERT_FROM_UTF8)ISO8859-3 >$@
- 
- %latin4.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO8859-4 >$@
-+	$(CONVERT_FROM_UTF8)ISO8859-4 >$@
- 
- %iso88595.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO-8859-5 >$@
-+	$(CONVERT_FROM_UTF8)ISO-8859-5 >$@
- 
- %iso88597.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO-8859-7 >$@
-+	$(CONVERT_FROM_UTF8)ISO-8859-7 >$@
- 
- %iso88598.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO-8859-8 >$@
-+	$(CONVERT_FROM_UTF8)ISO-8859-8 >$@
- 
- %latin5.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO8859-5 >$@
-+	$(CONVERT_FROM_UTF8)ISO8859-5 >$@
- 
- %latin9.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
--	iconv -f UTF-8 -t ISO-8859-15 >$@
-+	$(CONVERT_FROM_UTF8)ISO-8859-15 >$@
- 
- romanian/cp1250.pl : romanian/utf8.pl
- 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
--	iconv -f UTF-8 -t CP1250 >$@
-+	$(CONVERT_FROM_UTF8)CP1250 >$@
- 
- %cp1250.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t CP1250 >$@
-+	$(CONVERT_FROM_UTF8)CP1250 >$@
- 
- %cp1251.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t CP1251 >$@
-+	$(CONVERT_FROM_UTF8)CP1251 >$@
- 
- %cp1252.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
--	iconv -f UTF-8 -t CP1252 >$@
-+	$(CONVERT_FROM_UTF8)CP1252 >$@
- 
- %isoir111.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t ISO-IR-111 >$@
-+	$(CONVERT_FROM_UTF8)ISO-IR-111 >$@
- 
- %koi8-r.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t KOI8-R >$@
-+	$(CONVERT_FROM_UTF8)KOI8-R >$@
- 
- %koi8-u.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
--	iconv -f UTF-8 -t KOI8-U >$@
-+	$(CONVERT_FROM_UTF8)KOI8-U >$@
- 
- # %tex.pl : %utf8.pl utf8-to-tex.sed
- #	sed -f $(srcdir)/utf8-to-tex.sed <$< >$@
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-04-versiondir b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-04-versiondir
deleted file mode 100644
index df67fc9b2f2..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-04-versiondir
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/Makefile.am xindy/Makefile.am
---- xindy.orig/Makefile.am	2009-03-29 12:59:15.000000000 +0200
-+++ xindy/Makefile.am	2009-11-24 13:51:59.000000000 +0100
-@@ -40,7 +40,7 @@
- 
- EXTRA_DIST = setup.sh ChangeLog.Gour VERSION
- 
--versiondir = ${prefix}
-+versiondir = ${pkglibdir}
- version_DATA = VERSION
- 
- 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-05-notinstall-perl b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-05-notinstall-perl
deleted file mode 100644
index e04bd4647c9..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-05-notinstall-perl
+++ /dev/null
@@ -1,777 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
---- xindy.orig/make-rules/alphabets/Makefile.am	2009-11-23 22:36:01.000000000 +0100
-+++ xindy/make-rules/alphabets/Makefile.am	2009-11-24 19:38:01.000000000 +0100
-@@ -21,19 +21,23 @@
- 
- langdir	= $(pkglibdir)/modules/lang
- 
-+DISTCLEANFILES =
-+
- albaniandir = $(langdir)/albanian
- 
- ALBANIAN = \
- 	albanian/latin1-lang.xdy \
- 	albanian/latin1-test.xdy \
- 	albanian/latin1.xdy \
--	albanian/utf8.pl \
- 	albanian/utf8-lang.xdy \
- 	albanian/utf8-test.xdy \
- 	albanian/utf8.xdy
- 
- nodist_albanian_DATA = $(ALBANIAN)
- 
-+DISTCLEANFILES += \
-+	albanian/utf8.pl
-+
- belarusiandir = $(langdir)/belarusian
- 
- BELARUSIAN = \
-@@ -46,13 +50,14 @@
- 	belarusian/isoir111-lang.xdy \
- 	belarusian/isoir111-test.xdy \
- 	belarusian/isoir111.xdy \
--	belarusian/utf8.pl \
- 	belarusian/utf8-lang.xdy \
- 	belarusian/utf8-test.xdy \
- 	belarusian/utf8.xdy
- 
- nodist_belarusian_DATA = $(BELARUSIAN)
- 
-+DISTCLEANFILES += \
-+	belarusian/utf8.pl
- 
- bulgariandir = $(langdir)/bulgarian
- 
-@@ -66,13 +71,15 @@
- 	bulgarian/koi8-r-lang.xdy \
- 	bulgarian/koi8-r-test.xdy \
- 	bulgarian/koi8-r.xdy \
--	bulgarian/utf8.pl \
- 	bulgarian/utf8-lang.xdy \
- 	bulgarian/utf8-test.xdy \
- 	bulgarian/utf8.xdy
- 
- nodist_bulgarian_DATA = $(BULGARIAN)
- 
-+DISTCLEANFILES += \
-+	bulgarian/utf8.pl
-+
- croatiandir = $(langdir)/croatian
- 
- CROATIAN = \
-@@ -82,13 +89,15 @@
- 	croatian/latin2-lang.xdy \
- 	croatian/latin2-test.xdy \
- 	croatian/latin2.xdy \
--	croatian/utf8.pl \
- 	croatian/utf8-lang.xdy \
- 	croatian/utf8-test.xdy \
- 	croatian/utf8.xdy
- 
- nodist_croatian_DATA = $(CROATIAN)
- 
-+DISTCLEANFILES += \
-+	croatian/utf8.pl
-+
- czechdir = $(langdir)/czech
- 
- CZECH = \
-@@ -98,13 +107,14 @@
- 	czech/latin2-lang.xdy \
- 	czech/latin2-test.xdy \
- 	czech/latin2.xdy \
--	czech/utf8.pl \
- 	czech/utf8-lang.xdy \
- 	czech/utf8-test.xdy \
- 	czech/utf8.xdy
- 
- nodist_czech_DATA = $(CZECH)
- 
-+DISTCLEANFILES += \
-+	czech/utf8.pl
- 
- danishdir = $(langdir)/danish
- 
-@@ -115,30 +125,34 @@
- 	danish/latin9-lang.xdy \
- 	danish/latin9-test.xdy \
- 	danish/latin9.xdy \
--	danish/utf8.pl \
- 	danish/utf8-lang.xdy \
- 	danish/utf8-test.xdy \
- 	danish/utf8.xdy
- 
- nodist_danish_DATA = $(DANISH)
- 
-+DISTCLEANFILES += \
-+	danish/utf8.pl
-+
- dutchdir = $(langdir)/dutch
- 
- DUTCH = \
- 	dutch/ij-as-ij-latin1-lang.xdy \
- 	dutch/ij-as-ij-latin1-test.xdy \
- 	dutch/ij-as-ij-latin1.xdy \
--	dutch/ij-as-ij-utf8.pl \
- 	dutch/ij-as-ij-utf8-lang.xdy \
- 	dutch/ij-as-ij-utf8-test.xdy \
- 	dutch/ij-as-ij-utf8.xdy \
--	dutch/ij-as-y-utf8.pl \
- 	dutch/ij-as-y-utf8-lang.xdy \
- 	dutch/ij-as-y-utf8-test.xdy \
- 	dutch/ij-as-y-utf8.xdy
- 
- nodist_dutch_DATA = $(DUTCH)
- 
-+DISTCLEANFILES += \
-+	dutch/ij-as-ij-utf8.pl \
-+	dutch/ij-as-y-utf8.pl
-+
- englishdir = $(langdir)/english
- 
- ENGLISH = \
-@@ -148,26 +162,30 @@
- 	english/latin9-lang.xdy  \
- 	english/latin9-test.xdy \
- 	english/latin9.xdy \
--	english/utf8.pl \
- 	english/utf8-lang.xdy \
- 	english/utf8-test.xdy \
- 	english/utf8.xdy
- 
- nodist_english_DATA = $(ENGLISH)
- 
-+DISTCLEANFILES += \
-+	english/utf8.pl
-+
- esperantodir = $(langdir)/esperanto
- 
- ESPERANTO = \
- 	esperanto/latin3-lang.xdy \
- 	esperanto/latin3-test.xdy \
- 	esperanto/latin3.xdy \
--	esperanto/utf8.pl \
- 	esperanto/utf8-lang.xdy \
- 	esperanto/utf8-test.xdy \
- 	esperanto/utf8.xdy
- 
- nodist_esperanto_DATA = $(ESPERANTO)
- 
-+DISTCLEANFILES += \
-+	esperanto/utf8.pl
-+
- estoniandir = $(langdir)/estonian
- 
- ESTONIAN = \
-@@ -177,13 +195,15 @@
- 	estonian/latin9-lang.xdy \
- 	estonian/latin9-test.xdy \
- 	estonian/latin9.xdy \
--	estonian/utf8.pl \
- 	estonian/utf8-lang.xdy \
- 	estonian/utf8-test.xdy \
- 	estonian/utf8.xdy
- 
- nodist_estonian_DATA = $(ESTONIAN)
- 
-+DISTCLEANFILES += \
-+	estonian/utf8.pl
-+
- finnishdir = $(langdir)/finnish
- 
- FINNISH = \
-@@ -193,13 +213,15 @@
- 	finnish/latin9-lang.xdy \
- 	finnish/latin9-test.xdy \
- 	finnish/latin9.xdy \
--	finnish/utf8.pl \
- 	finnish/utf8-lang.xdy \
- 	finnish/utf8-test.xdy \
- 	finnish/utf8.xdy
- 
- nodist_finnish_DATA = $(FINNISH)
- 
-+DISTCLEANFILES += \
-+	finnish/utf8.pl
-+
- frenchdir = $(langdir)/french
- 
- FRENCH = \
-@@ -209,13 +231,15 @@
- 	french/latin9-lang.xdy \
- 	french/latin9-test.xdy \
- 	french/latin9.xdy \
--	french/utf8.pl \
- 	french/utf8-lang.xdy \
- 	french/utf8-test.xdy \
- 	french/utf8.xdy
- 
- nodist_french_DATA = $(FRENCH)
- 
-+DISTCLEANFILES += \
-+	french/utf8.pl
-+
- generaldir = $(langdir)/general
- 
- GENERAL = \
-@@ -228,104 +252,118 @@
- 	general/latin9-lang.xdy \
- 	general/latin9-test.xdy \
- 	general/latin9.xdy \
--	general/utf8.pl \
- 	general/utf8-lang.xdy \
- 	general/utf8-test.xdy \
- 	general/utf8.xdy
- 
- nodist_general_DATA = $(GENERAL)
- 
-+DISTCLEANFILES += \
-+	general/utf8.pl
-+
- georgiandir = $(langdir)/georgian
- 
- GEORGIAN = \
--	georgian/utf8.pl \
- 	georgian/utf8-lang.xdy \
- 	georgian/utf8-test.xdy \
- 	georgian/utf8.xdy
- 
- nodist_georgian_DATA = $(GEORGIAN)
- 
-+DISTCLEANFILES += \
-+	georgian/utf8.pl
-+
- germandir = $(langdir)/german
- 
- GERMAN = \
--	german/braille-utf8.pl \
- 	german/braille-utf8-lang.xdy \
- 	german/braille-utf8-test.xdy \
- 	german/braille-utf8.xdy \
- 	german/din5007-latin1-lang.xdy \
- 	german/din5007-latin1-test.xdy \
- 	german/din5007-latin1.xdy \
--	german/din5007-utf8.pl \
- 	german/din5007-utf8-lang.xdy \
- 	german/din5007-utf8-test.xdy \
- 	german/din5007-utf8.xdy \
- 	german/duden-latin1-lang.xdy \
- 	german/duden-latin1-test.xdy \
- 	german/duden-latin1.xdy \
--	german/duden-utf8.pl \
- 	german/duden-utf8-lang.xdy \
- 	german/duden-utf8-test.xdy \
- 	german/duden-utf8.xdy
- 
- nodist_german_DATA = $(GERMAN)
- 
-+DISTCLEANFILES += \
-+	german/braille-utf8.pl \
-+	german/din5007-utf8.pl \
-+	german/duden-utf8.pl
-+
- greekdir = $(langdir)/greek
- 
- GREEK = \
- 	greek/iso88597-lang.xdy \
- 	greek/iso88597-test.xdy \
- 	greek/iso88597.xdy \
--	greek/polytonic-utf8.pl \
- 	greek/polytonic-utf8-lang.xdy \
- 	greek/polytonic-utf8-test.xdy \
- 	greek/polytonic-utf8.xdy \
- 	greek/translit-latin4-lang.xdy \
- 	greek/translit-latin4-test.xdy \
- 	greek/translit-latin4.xdy \
--	greek/translit-utf8.pl \
- 	greek/translit-utf8-lang.xdy \
- 	greek/translit-utf8-test.xdy \
- 	greek/translit-utf8.xdy \
--	greek/utf8.pl \
- 	greek/utf8-lang.xdy \
- 	greek/utf8-test.xdy \
- 	greek/utf8.xdy
- 
- nodist_greek_DATA = $(GREEK)
- 
-+DISTCLEANFILES += \
-+	greek/polytonic-utf8.pl \
-+	greek/translit-utf8.pl \
-+	greek/utf8.pl
-+
- gypsydir = $(langdir)/gypsy
- 
- GYPSY = \
--	gypsy/northrussian-utf8.pl \
- 	gypsy/northrussian-utf8-lang.xdy \
- 	gypsy/northrussian-utf8-test.xdy \
- 	gypsy/northrussian-utf8.xdy
- 
- nodist_gypsy_DATA = $(GYPSY)
- 
-+DISTCLEANFILES += \
-+	gypsy/northrussian-utf8.pl
-+
- hausadir = $(langdir)/hausa
- 
- HAUSA = \
--	hausa/utf8.pl \
- 	hausa/utf8-lang.xdy \
- 	hausa/utf8-test.xdy \
- 	hausa/utf8.xdy
- 
- nodist_hausa_DATA = $(HAUSA)
- 
-+DISTCLEANFILES += \
-+	hausa/utf8.pl
-+
- hebrewdir = $(langdir)/hebrew
- 
- HEBREW = \
- 	hebrew/iso88598-lang.xdy \
- 	hebrew/iso88598-test.xdy \
- 	hebrew/iso88598.xdy \
--	hebrew/utf8.pl \
- 	hebrew/utf8-lang.xdy \
- 	hebrew/utf8-test.xdy \
- 	hebrew/utf8.xdy
- 
- nodist_hebrew_DATA = $(HEBREW)
- 
-+DISTCLEANFILES += \
-+	hebrew/utf8.pl
-+
- hungariandir = $(langdir)/hungarian
- 
- HUNGARIAN = \
-@@ -335,13 +373,15 @@
- 	hungarian/latin2-lang.xdy \
- 	hungarian/latin2-test.xdy \
- 	hungarian/latin2.xdy \
--	hungarian/utf8.pl \
- 	hungarian/utf8-lang.xdy \
- 	hungarian/utf8-test.xdy \
- 	hungarian/utf8.xdy
- 
- nodist_hungarian_DATA = $(HUNGARIAN)
- 
-+DISTCLEANFILES += \
-+	hungarian/utf8.pl
-+
- icelandicdir = $(langdir)/icelandic
- 
- ICELANDIC = \
-@@ -351,92 +391,106 @@
- 	icelandic/latin9-lang.xdy \
- 	icelandic/latin9-test.xdy \
- 	icelandic/latin9.xdy \
--	icelandic/utf8.pl \
- 	icelandic/utf8-lang.xdy \
- 	icelandic/utf8-test.xdy \
- 	icelandic/utf8.xdy
- 
- nodist_icelandic_DATA = $(ICELANDIC)
- 
-+DISTCLEANFILES += \
-+	icelandic/utf8.pl
-+
- italiandir = $(langdir)/italian
- 
- ITALIAN = \
- 	italian/latin1-lang.xdy \
- 	italian/latin1-test.xdy \
- 	italian/latin1.xdy \
--	italian/utf8.pl \
- 	italian/utf8-lang.xdy \
- 	italian/utf8-test.xdy \
- 	italian/utf8.xdy
- 
- nodist_italian_DATA = $(ITALIAN)
- 
-+DISTCLEANFILES += \
-+	italian/utf8.pl
-+
- klingondir = $(langdir)/klingon
- 
- KLINGON = \
--	klingon/utf8.pl \
- 	klingon/utf8-lang.xdy \
- 	klingon/utf8-test.xdy \
- 	klingon/utf8.xdy
- 
- nodist_klingon_DATA = $(KLINGON)
- 
-+DISTCLEANFILES += \
-+	klingon/utf8.pl
-+
- kurdishdir = $(langdir)/kurdish
- 
- KURDISH = \
- 	kurdish/bedirxan-latin5-lang.xdy \
- 	kurdish/bedirxan-latin5-test.xdy \
- 	kurdish/bedirxan-latin5.xdy \
--	kurdish/bedirxan-utf8.pl \
- 	kurdish/bedirxan-utf8-lang.xdy \
- 	kurdish/bedirxan-utf8-test.xdy \
- 	kurdish/bedirxan-utf8.xdy \
- 	kurdish/turkish-i-latin5-lang.xdy \
- 	kurdish/turkish-i-latin5-test.xdy \
- 	kurdish/turkish-i-latin5.xdy \
--	kurdish/turkish-i-utf8.pl \
- 	kurdish/turkish-i-utf8-lang.xdy \
- 	kurdish/turkish-i-utf8-test.xdy \
- 	kurdish/turkish-i-utf8.xdy
- 
- nodist_kurdish_DATA = $(KURDISH)
- 
-+DISTCLEANFILES += \
-+	kurdish/bedirxan-utf8.pl \
-+	kurdish/turkish-i-utf8.pl
-+
- latindir = $(langdir)/latin
- 
- LATIN = \
--	latin/utf8.pl \
- 	latin/utf8-lang.xdy \
- 	latin/utf8-test.xdy \
- 	latin/utf8.xdy
- 
- nodist_latin_DATA = $(LATIN)
- 
-+DISTCLEANFILES += \
-+	latin/utf8.pl
-+
- latviandir = $(langdir)/latvian
- 
- LATVIAN = \
- 	latvian/latin4-lang.xdy \
- 	latvian/latin4-test.xdy \
- 	latvian/latin4.xdy \
--	latvian/utf8.pl \
- 	latvian/utf8-lang.xdy \
- 	latvian/utf8-test.xdy \
- 	latvian/utf8.xdy
- 
- nodist_latvian_DATA = $(LATVIAN)
- 
-+DISTCLEANFILES += \
-+	latvian/utf8.pl
-+
- lithuaniandir = $(langdir)/lithuanian
- 
- LITHUANIAN = \
- 	lithuanian/latin4-lang.xdy \
- 	lithuanian/latin4-test.xdy \
- 	lithuanian/latin4.xdy \
--	lithuanian/utf8.pl \
- 	lithuanian/utf8-lang.xdy \
- 	lithuanian/utf8-test.xdy \
- 	lithuanian/utf8.xdy
- 
- nodist_lithuanian_DATA = $(LITHUANIAN)
- 
-+DISTCLEANFILES += \
-+	lithuanian/utf8.pl
-+
- lower_sorbiandir = $(langdir)/lower-sorbian
- 
- LOWER_SORBIAN = \
-@@ -446,13 +500,15 @@
- 	lower-sorbian/latin2-lang.xdy \
- 	lower-sorbian/latin2-test.xdy \
- 	lower-sorbian/latin2.xdy \
--	lower-sorbian/utf8.pl \
- 	lower-sorbian/utf8-lang.xdy \
- 	lower-sorbian/utf8-test.xdy \
- 	lower-sorbian/utf8.xdy
- 
- nodist_lower_sorbian_DATA = $(LOWER_SORBIAN)
- 
-+DISTCLEANFILES += \
-+	lower-sorbian/utf8.pl
-+
- macedoniandir = $(langdir)/macedonian
- 
- MACEDONIAN = \
-@@ -465,36 +521,42 @@
- 	macedonian/isoir111-lang.xdy \
- 	macedonian/isoir111-test.xdy \
- 	macedonian/isoir111.xdy \
--	macedonian/utf8.pl \
- 	macedonian/utf8-lang.xdy \
- 	macedonian/utf8-test.xdy \
- 	macedonian/utf8.xdy
- 
- nodist_macedonian_DATA = $(MACEDONIAN)
- 
-+DISTCLEANFILES += \
-+	macedonian/utf8.pl
-+
- mongoliandir = $(langdir)/mongolian
- 
- MONGOLIAN = \
--	mongolian/cyrillic-utf8.pl \
- 	mongolian/cyrillic-utf8-lang.xdy \
- 	mongolian/cyrillic-utf8-test.xdy \
- 	mongolian/cyrillic-utf8.xdy
- 
- nodist_mongolian_DATA = $(MONGOLIAN)
- 
-+DISTCLEANFILES += \
-+	mongolian/cyrillic-utf8.pl
-+
- norwegiandir = $(langdir)/norwegian
- 
- NORWEGIAN = \
- 	norwegian/latin1-lang.xdy \
- 	norwegian/latin1-test.xdy \
- 	norwegian/latin1.xdy \
--	norwegian/utf8.pl \
- 	norwegian/utf8-lang.xdy \
- 	norwegian/utf8-test.xdy \
- 	norwegian/utf8.xdy
- 
- nodist_norwegian_DATA = $(NORWEGIAN)
- 
-+DISTCLEANFILES += \
-+	norwegian/utf8.pl
-+
- polishdir = $(langdir)/polish
- 
- POLISH = \
-@@ -504,39 +566,45 @@
- 	polish/latin2-lang.xdy \
- 	polish/latin2-test.xdy \
- 	polish/latin2.xdy \
--	polish/utf8.pl \
- 	polish/utf8-lang.xdy \
- 	polish/utf8-test.xdy \
- 	polish/utf8.xdy
- 
- nodist_polish_DATA = $(POLISH)
- 
-+DISTCLEANFILES += \
-+	polish/utf8.pl
-+
- portuguesedir = $(langdir)/portuguese
- 
- PORTUGUESE = \
- 	portuguese/latin1-lang.xdy \
- 	portuguese/latin1-test.xdy \
- 	portuguese/latin1.xdy \
--	portuguese/utf8.pl \
- 	portuguese/utf8-lang.xdy \
- 	portuguese/utf8-test.xdy \
- 	portuguese/utf8.xdy
- 
- nodist_portuguese_DATA = $(PORTUGUESE)
- 
-+DISTCLEANFILES += \
-+	portuguese/utf8.pl
-+
- romaniandir = $(langdir)/romanian
- 
- ROMANIAN = \
- 	romanian/latin2-lang.xdy \
- 	romanian/latin2-test.xdy \
- 	romanian/latin2.xdy \
--	romanian/utf8.pl \
- 	romanian/utf8-lang.xdy \
- 	romanian/utf8-test.xdy \
- 	romanian/utf8.xdy
- 
- nodist_romanian_DATA = $(ROMANIAN)
- 
-+DISTCLEANFILES += \
-+	romanian/utf8.pl
-+
- russiandir = $(langdir)/russian
- 
- RUSSIAN = \
-@@ -549,17 +617,19 @@
- 	russian/koi8-r-lang.xdy \
- 	russian/koi8-r-test.xdy \
- 	russian/koi8-r.xdy \
--	russian/translit-iso-utf8.pl \
- 	russian/translit-iso-utf8-lang.xdy \
- 	russian/translit-iso-utf8-test.xdy \
- 	russian/translit-iso-utf8.xdy \
--	russian/utf8.pl \
- 	russian/utf8-lang.xdy \
- 	russian/utf8-test.xdy \
- 	russian/utf8.xdy
- 
- nodist_russian_DATA = $(RUSSIAN)
- 
-+DISTCLEANFILES += \
-+	russian/translit-iso-utf8.pl \
-+	russian/utf8.pl
-+
- serbiandir = $(langdir)/serbian
- 
- SERBIAN = \
-@@ -572,13 +642,15 @@
- 	serbian/isoir111-lang.xdy \
- 	serbian/isoir111-test.xdy \
- 	serbian/isoir111.xdy \
--	serbian/utf8.pl \
- 	serbian/utf8-lang.xdy \
- 	serbian/utf8-test.xdy \
- 	serbian/utf8.xdy
- 
- nodist_serbian_DATA = $(SERBIAN)
- 
-+DISTCLEANFILES += \
-+	serbian/utf8.pl
-+
- slovakdir = $(langdir)/slovak
- 
- SLOVAK = \
-@@ -588,7 +660,6 @@
- 	slovak/large-latin2-lang.xdy \
- 	slovak/large-latin2-test.xdy \
- 	slovak/large-latin2.xdy \
--	slovak/large-utf8.pl \
- 	slovak/large-utf8-lang.xdy \
- 	slovak/large-utf8-test.xdy \
- 	slovak/large-utf8.xdy \
-@@ -598,13 +669,16 @@
- 	slovak/small-latin2-lang.xdy \
- 	slovak/small-latin2-test.xdy \
- 	slovak/small-latin2.xdy \
--	slovak/small-utf8.pl \
- 	slovak/small-utf8-lang.xdy \
- 	slovak/small-utf8-test.xdy \
- 	slovak/small-utf8.xdy
- 
- nodist_slovak_DATA = $(SLOVAK)
- 
-+DISTCLEANFILES += \
-+	slovak/large-utf8.pl \
-+	slovak/small-utf8.pl
-+
- sloveniandir = $(langdir)/slovenian
- 
- SLOVENIAN = \
-@@ -614,33 +688,37 @@
- 	slovenian/latin2-lang.xdy \
- 	slovenian/latin2-test.xdy \
- 	slovenian/latin2.xdy \
--	slovenian/utf8.pl \
- 	slovenian/utf8-lang.xdy \
- 	slovenian/utf8-test.xdy \
- 	slovenian/utf8.xdy
- 
- nodist_slovenian_DATA = $(SLOVENIAN)
- 
-+DISTCLEANFILES += \
-+	slovenian/utf8.pl
-+
- spanishdir = $(langdir)/spanish
- 
- SPANISH = \
- 	spanish/modern-latin1-lang.xdy \
- 	spanish/modern-latin1-test.xdy \
- 	spanish/modern-latin1.xdy \
--	spanish/modern-utf8.pl \
- 	spanish/modern-utf8-lang.xdy \
- 	spanish/modern-utf8-test.xdy \
- 	spanish/modern-utf8.xdy \
- 	spanish/traditional-latin1-lang.xdy \
- 	spanish/traditional-latin1-test.xdy \
- 	spanish/traditional-latin1.xdy \
--	spanish/traditional-utf8.pl \
- 	spanish/traditional-utf8-lang.xdy \
- 	spanish/traditional-utf8-test.xdy \
- 	spanish/traditional-utf8.xdy
- 
- nodist_spanish_DATA = $(SPANISH)
- 
-+DISTCLEANFILES += \
-+	spanish/modern-utf8.pl \
-+	spanish/traditional-utf8.pl
-+
- swedishdir = $(langdir)/swedish
- 
- SWEDISH = \
-@@ -650,13 +728,15 @@
- 	swedish/latin9-lang.xdy \
- 	swedish/latin9-test.xdy \
- 	swedish/latin9.xdy \
--	swedish/utf8.pl \
- 	swedish/utf8-lang.xdy \
- 	swedish/utf8-test.xdy \
- 	swedish/utf8.xdy
- 
- nodist_swedish_DATA = $(SWEDISH)
- 
-+DISTCLEANFILES += \
-+	swedish/utf8.pl
-+
- turkishdir = $(langdir)/turkish
- 
- TURKISH = \
-@@ -666,13 +746,15 @@
- 	turkish/latin5-lang.xdy \
- 	turkish/latin5-test.xdy \
- 	turkish/latin5.xdy \
--	turkish/utf8.pl \
- 	turkish/utf8-lang.xdy \
- 	turkish/utf8-test.xdy \
- 	turkish/utf8.xdy
- 
- nodist_turkish_DATA = $(TURKISH)
- 
-+DISTCLEANFILES += \
-+	turkish/utf8.pl
-+
- ukrainiandir = $(langdir)/ukrainian
- 
- UKRAINIAN = \
-@@ -682,13 +764,15 @@
- 	ukrainian/koi8-u-lang.xdy \
- 	ukrainian/koi8-u-test.xdy \
- 	ukrainian/koi8-u.xdy \
--	ukrainian/utf8.pl \
- 	ukrainian/utf8-lang.xdy \
- 	ukrainian/utf8-test.xdy \
- 	ukrainian/utf8.xdy
- 
- nodist_ukrainian_DATA = $(UKRAINIAN)
- 
-+DISTCLEANFILES += \
-+	ukrainian/utf8.pl
-+
- upper_sorbiandir = $(langdir)/upper-sorbian
- 
- UPPER_SORBIAN = \
-@@ -698,23 +782,27 @@
- 	upper-sorbian/latin2-lang.xdy \
- 	upper-sorbian/latin2-test.xdy \
- 	upper-sorbian/latin2.xdy \
--	upper-sorbian/utf8.pl \
- 	upper-sorbian/utf8-lang.xdy \
- 	upper-sorbian/utf8-test.xdy \
- 	upper-sorbian/utf8.xdy
- 
- nodist_upper_sorbian_DATA = $(UPPER_SORBIAN)
- 
-+DISTCLEANFILES += \
-+	upper-sorbian/utf8.pl
-+
- vietnamesedir = $(langdir)/vietnamese
- 
- VIETNAMESE = \
--	vietnamese/utf8.pl \
- 	vietnamese/utf8-lang.xdy \
- 	vietnamese/utf8-test.xdy \
- 	vietnamese/utf8.xdy
- 
- nodist_vietnamese_DATA = $(VIETNAMESE)
- 
-+DISTCLEANFILES += \
-+	vietnamese/utf8.pl
-+
- 
- %utf8.pl : %utf8.pl.in
- 	sed -e 's/@.{\([^}]*\)}/\1/g;' <$< >$@
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-06-distcheck b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-06-distcheck
deleted file mode 100644
index dfea53c388e..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-06-distcheck
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/Makefile.am xindy/Makefile.am
---- xindy.orig/Makefile.am	2009-11-24 13:51:59.000000000 +0100
-+++ xindy/Makefile.am	2009-11-24 21:21:06.000000000 +0100
-@@ -38,7 +38,7 @@
-   SUBDIRS += doc
- endif
- 
--EXTRA_DIST = setup.sh ChangeLog.Gour VERSION
-+EXTRA_DIST = setup.sh ChangeLog.Gour VERSION TODO.autoconf
- 
- versiondir = ${pkglibdir}
- version_DATA = VERSION
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/configure.ac xindy/configure.ac
---- xindy.orig/configure.ac	2009-11-23 23:13:08.000000000 +0100
-+++ xindy/configure.ac	2009-11-24 21:12:44.000000000 +0100
-@@ -33,7 +33,7 @@
- # Automake's dist target needs all to-be-distributed files flagged in
- # Makefile.am files; we have not done that yet. Since we don't do C
- # programs, automake's defaults are not usable for us, too.
--AM_INIT_AUTOMAKE([foreign no-dist no-define])
-+AM_INIT_AUTOMAKE([foreign no-define])
- 
- # Test for building make-rules
- AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules ],[build and install make-rules package (default is YES)]),[BUILDRULES=$enableval],[BUILDRULES=yes])
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/doc/Makefile.am xindy/doc/Makefile.am
---- xindy.orig/doc/Makefile.am	2009-03-29 12:43:49.000000000 +0200
-+++ xindy/doc/Makefile.am	2009-11-24 22:01:19.000000000 +0100
-@@ -52,7 +52,7 @@
- 	toc.gif \
- 	xindy.pdf
- 
--EXTRA_DIST = $(FILES)
-+EXTRA_DIST = $(FILES) xindy.v2.pdf
- 
- doc_DATA = $(FILES)
- 
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
---- xindy.orig/make-rules/alphabets/Makefile.am	2009-11-24 19:38:01.000000000 +0100
-+++ xindy/make-rules/alphabets/Makefile.am	2009-11-24 21:26:44.000000000 +0100
-@@ -803,7 +803,6 @@
- DISTCLEANFILES += \
- 	vietnamese/utf8.pl
- 
--
- %utf8.pl : %utf8.pl.in
- 	sed -e 's/@.{\([^}]*\)}/\1/g;' <$< >$@
- 
-@@ -819,6 +818,9 @@
- 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
- 	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
- 
-+DISTCLEANFILES += \
-+	romanian/latin2.pl
-+
- %latin2.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
- 	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
-@@ -855,6 +857,9 @@
- 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
- 	$(CONVERT_FROM_UTF8)CP1250 >$@
- 
-+DISTCLEANFILES += \
-+	romanian/cp1250.pl
-+
- %cp1250.pl : %utf8.pl.in
- 	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
- 	$(CONVERT_FROM_UTF8)CP1250 >$@
-@@ -1255,7 +1260,7 @@
- 	alphabets-inc.tex \
- 	alphabets-doc.toc
- 
--EXTRA_DIST = $(SCRS) test.xdy
-+EXTRA_DIST = $(SCRS) test.xdy rom-comma-kludge.sed
- 
- CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
- 
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/src/Makefile.am xindy/src/Makefile.am
---- xindy.orig/src/Makefile.am	2009-11-20 23:59:25.000000000 +0100
-+++ xindy/src/Makefile.am	2009-11-24 21:24:31.000000000 +0100
-@@ -56,13 +56,13 @@
- $(DEFAULTS): $(DEFAULTS).in Makefile
- 	sed 's|@MODULEDIR[@]|$(MODULEDIR)|g' <$(srcdir)/$(DEFAULTS).in >$(DEFAULTS)
- 
--EXTRA_DIST = $(DEFAULTS).in $(dist_xindy_mem_sources)
-+EXTRA_DIST = $(DEFAULTS).in $(dist_xindy_mem_sources) dump-xindy.lsp
- 
- SUFFIXES = .fas .lsp
- .lsp.fas:
- 	$(CLISP) -c $< -o $@
- 
- 
--CLEANFILES = $(FAS) $(FASLIBS) $(DEFAULTS)
-+CLEANFILES = $(FAS) $(FASLIBS) $(DEFAULTS) xindy.mem
- 
- 
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
---- xindy.orig/user-commands/Makefile.am	2009-11-20 23:12:03.000000000 +0100
-+++ xindy/user-commands/Makefile.am	2009-11-24 21:16:54.000000000 +0100
-@@ -31,7 +31,7 @@
- 
- man_MANS = texindy.1 xindy.1 xindy.v2.1
- 
--EXTRA_DIST = $(man_MANS)
-+EXTRA_DIST = $(man_MANS) texindy xindy.in xindy.v2.in
- 
- CLEANFILES = xindy xindy.v2
- 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-07-perl-runtime b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-07-perl-runtime
deleted file mode 100644
index 2b04b75a5df..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-07-perl-runtime
+++ /dev/null
@@ -1,31 +0,0 @@
-	With this patch you can rename user-commands/xindy.v2.in
-	=> user-commands/xindy.v2 and simplify user-commands/Makefile.am
-	accordingly.
-
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/user-commands/texindy xindy/user-commands/texindy
---- xindy.orig/user-commands/texindy	2009-03-22 12:09:29.000000000 +0100
-+++ xindy/user-commands/texindy	2009-11-24 22:03:22.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#! /usr/bin/env perl
- # $Id: texindy,v 1.8 2009/03/22 11:08:18 jschrod Exp $
- #------------------------------------------------------------
- # (history at end)
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in
---- xindy.orig/user-commands/xindy.in	2009-03-29 13:14:55.000000000 +0200
-+++ xindy/user-commands/xindy.in	2009-11-24 22:03:21.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#! /usr/bin/env perl
- # $Id: xindy.pl,v 1.13 2009/03/29 11:14:04 jschrod Exp $
- #------------------------------------------------------------
- # (history at end)
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/user-commands/xindy.v2.in xindy/user-commands/xindy.v2.in
---- xindy.orig/user-commands/xindy.v2.in	2005-05-30 23:10:02.000000000 +0200
-+++ xindy/user-commands/xindy.v2.in	2009-11-24 22:03:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!@XINDY_PERL@
-+#! /usr/bin/env perl
- # $Id: xindy.in,v 1.14 2005/05/02 19:16:27 jschrod Exp $
- #------------------------------------------------------------
- #
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-08-perl-build b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-08-perl-build
deleted file mode 100644
index b285364ff4b..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-08-perl-build
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/configure.ac xindy/configure.ac
---- xindy.orig/configure.ac	2009-11-24 21:12:44.000000000 +0100
-+++ xindy/configure.ac	2009-11-25 13:52:19.000000000 +0100
-@@ -51,9 +51,10 @@
- AC_PROG_INSTALL
- # CLISP for src/
- AC_PATH_PROG([CLISP],[clisp])
-+AC_PATH_PROG([PERL], [perl])
- # flex for tex2xindy
- # FIXME: lex actually must really be flex. But there is no AC_PROG_FLEX!?
--AM_PROG_LEX
-+AC_PROG_LEX
- AC_PROG_CC
- 
- # On some systems without working iconv, we must use recode.
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
---- xindy.orig/make-rules/alphabets/Makefile.am	2009-11-24 21:26:44.000000000 +0100
-+++ xindy/make-rules/alphabets/Makefile.am	2009-11-25 14:01:03.000000000 +0100
-@@ -893,13 +893,13 @@
- 	sed -n '1,10 p' <$< >$@
- 
- %-test.xdy : %.pl
--	perl -I$(srcdir) $< $*
-+	$(PERL) -I$(srcdir) $< $*
- 
- %-doc.tex : %.pl
--	perl -I$(srcdir) $< $*
-+	$(PERL) -I$(srcdir) $< $*
- 
- %.xdy :	%.pl
--	perl -I$(srcdir) $< $*
-+	$(PERL) -I$(srcdir) $< $*
- 
- SUBDIRS = \
- 	albanian \
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/make-rules/inputenc/Makefile.am xindy/make-rules/inputenc/Makefile.am
---- xindy.orig/make-rules/inputenc/Makefile.am	2009-11-21 00:26:12.000000000 +0100
-+++ xindy/make-rules/inputenc/Makefile.am	2009-11-25 14:01:06.000000000 +0100
-@@ -46,9 +46,9 @@
- 	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
- 
- %.xdy %.idx :
--	perl $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex
-+	$(PERL) $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex
- 	latex -interaction batchmode $*.tex
--	perl $(srcdir)/make-inp-rules.pl <$*.idx >$*.xdy
-+	$(PERL) $(srcdir)/make-inp-rules.pl <$*.idx >$*.xdy
- 
- PERLSCRIPTS = \
- 	make-inp-rules.pl \
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am
---- xindy.orig/user-commands/Makefile.am	2009-11-24 21:16:54.000000000 +0100
-+++ xindy/user-commands/Makefile.am	2009-11-25 14:00:59.000000000 +0100
-@@ -25,9 +25,8 @@
- xindy: xindy.in Makefile
- 	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
- 
--# FIXME: Should get Perl location from autoconf
- xindy.v2: xindy.v2.in
--	sed -e 's:@XINDY_PERL\@:/usr/bin/perl:' $(srcdir)/xindy.v2.in >xindy.v2
-+	cat $(srcdir)/xindy.v2.in >xindy.v2
- 
- man_MANS = texindy.1 xindy.1 xindy.v2.1
- 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-09-flex-1 b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-09-flex-1
deleted file mode 100644
index aa399e78b33..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-09-flex-1
+++ /dev/null
@@ -1,29 +0,0 @@
-	AC_PROG_LEX automatically checks for the (f)lex library
-	and sets LEXLIB accordingly.
-
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/configure.ac xindy/configure.ac
---- xindy.orig/configure.ac	2009-11-25 13:52:19.000000000 +0100
-+++ xindy/configure.ac	2009-11-26 20:34:35.000000000 +0100
-@@ -76,10 +76,6 @@
- # What about a C compiler? install?
- test "$CLISP"  ||  AC_MSG_ERROR([CLISP is needed to build and run xindy])
- 
--# Check for flex library, the function to test for in this lib is main().
--# FIXME: Is this really needed; ain't that done by AM_PROG_LEX automatically?
--AC_CHECK_LIB([fl], [main])
--
- # No checks for header files. We use stdio.h, unistd.h, and string.h.
- # Today, they are universally available if a C compiler is installed.
- 
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/tex2xindy/Makefile.am xindy/tex2xindy/Makefile.am
---- xindy.orig/tex2xindy/Makefile.am	2009-03-29 13:23:50.000000000 +0200
-+++ xindy/tex2xindy/Makefile.am	2009-11-26 20:34:37.000000000 +0100
-@@ -23,7 +23,7 @@
- 
- tex2xindy_SOURCES = tex2xindy.l
- 
--## tex2xindy_LDADD = @LEXLIB@
-+tex2xindy_LDADD = $(LEXLIB)
- 
- man_MANS = tex2xindy.1
- 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-09-flex-2 b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-09-flex-2
deleted file mode 100644
index 6aa9325e79b..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-09-flex-2
+++ /dev/null
@@ -1,53 +0,0 @@
-	Even better define a dummy yywrap() to be independent of `libfl.a'.
-
-	Having flex or Unix lex is a minor issue, as long as an
-	up to date version of tex2xindy.c is distributed.
-
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/tex2xindy/Makefile.am xindy/tex2xindy/Makefile.am
---- xindy.orig/tex2xindy/Makefile.am	2009-11-26 20:34:37.000000000 +0100
-+++ xindy/tex2xindy/Makefile.am	2009-11-26 20:52:03.000000000 +0100
-@@ -23,8 +23,6 @@
- 
- tex2xindy_SOURCES = tex2xindy.l
- 
--tex2xindy_LDADD = $(LEXLIB)
--
- man_MANS = tex2xindy.1
- 
- EXTRA_DIST = $(man_MANS)
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/tex2xindy/tex2xindy.c xindy/tex2xindy/tex2xindy.c
---- xindy.orig/tex2xindy/tex2xindy.c	2009-03-29 13:49:12.000000000 +0200
-+++ xindy/tex2xindy/tex2xindy.c	2009-11-26 20:56:54.000000000 +0100
-@@ -2311,6 +2311,14 @@
- 
- 
- 
-+/*
-+ *  Define dummy yywrap so we no longer depend on `libfl.a'.
-+ */
-+int yywrap (void)
-+{
-+    return 1;
-+}
-+
- void usage ()
- {
-     fputs("This is tex2xindy, $Revision: 1.21 $.\n", stderr);
-diff -ur -x Makefile.in -x aclocal.m4 -x configure -x autom4te.cache xindy.orig/tex2xindy/tex2xindy.l xindy/tex2xindy/tex2xindy.l
---- xindy.orig/tex2xindy/tex2xindy.l	2006-07-30 11:44:04.000000000 +0200
-+++ xindy/tex2xindy/tex2xindy.l	2009-11-26 20:56:49.000000000 +0100
-@@ -362,6 +362,14 @@
- 
- %%
- 
-+/*
-+ *  Define dummy yywrap so we no longer depend on `libfl.a'.
-+ */
-+int yywrap (void)
-+{
-+    return 1;
-+}
-+
- void usage ()
- {
-     fputs("This is tex2xindy, $Revision: 1.21 $.\n", stderr);
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-10-superfluous b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-10-superfluous
deleted file mode 100644
index 4b0096e71de..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-10-superfluous
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur -x Makefile.in xindy.orig/src/Makefile.am xindy/src/Makefile.am
---- xindy.orig/src/Makefile.am	2009-11-24 21:24:31.000000000 +0100
-+++ xindy/src/Makefile.am	2009-11-29 17:37:35.000000000 +0100
-@@ -23,10 +23,6 @@
- # Where the modules are found at runtime.
- MODULEDIR = $(pkglibdir)/modules
- 
--# XXX
--AUTOMAKE_OPTIONS = no-exeext
--
--
- # Since automake has no CLISP support, we need to explicitly add make
- # rules to create the xindy kernel below and stop automake from
- # looking for C sources.
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-11-parallel b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-11-parallel
deleted file mode 100644
index 29490c3af57..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-11-parallel
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur -x Makefile.in xindy.orig/src/Makefile.am xindy/src/Makefile.am
---- xindy.orig/src/Makefile.am	2009-11-29 17:37:35.000000000 +0100
-+++ xindy/src/Makefile.am	2009-11-29 17:39:57.000000000 +0100
-@@ -61,4 +61,9 @@
- 
- CLEANFILES = $(FAS) $(FASLIBS) $(DEFAULTS) xindy.mem
- 
-+# Dependencies required for parallel make.
-+markup.fas: index.fas version.fas
-+index.fas: idxstyle.fas ordrules.fas
-+idxstyle.fas: locref.fas
-+locref.fas: base.fas
- 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-12-parallel b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-12-parallel
deleted file mode 100644
index b4182eaf1f6..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-12-parallel
+++ /dev/null
@@ -1,20 +0,0 @@
-	More problems with aggressive parallel builds (make -j).
-
-	The three rules:
-		%-test.xdy : %.pl
-			$(PERL) -I$(srcdir) $< $*
-		%-doc.tex : %.pl
-			$(PERL) -I$(srcdir) $< $*
-		%.xdy :	%.pl
-			$(PERL) -I$(srcdir) $< $*
-	must not run simultaneously or %-test.xdy could be destroyed.
-
-diff -ur -x Makefile.in xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
---- xindy.orig/make-rules/alphabets/Makefile.am	2009-11-25 14:01:03.000000000 +0100
-+++ xindy/make-rules/alphabets/Makefile.am	2009-12-02 16:42:50.000000000 +0100
-@@ -1264,3 +1264,5 @@
- 
- CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
- 
-+.NOTPARALLEL:
-+
diff --git a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-30-warnings b/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-30-warnings
deleted file mode 100644
index aff5c0a5161..00000000000
--- a/Build/source/utils/xindy-new/xindy-2.4-rc1-PATCHES/patch-30-warnings
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -ur -x Makefile.in xindy.orig/tex2xindy/Makefile.am xindy/tex2xindy/Makefile.am
---- xindy.orig/tex2xindy/Makefile.am	2009-11-26 20:52:03.000000000 +0100
-+++ xindy/tex2xindy/Makefile.am	2009-11-28 16:47:11.000000000 +0100
-@@ -19,6 +19,8 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
-+AM_CFLAGS = $(WARNING_CFLAGS)
-+
- bin_PROGRAMS = tex2xindy
- 
- tex2xindy_SOURCES = tex2xindy.l
-diff -ur -x Makefile.in xindy.orig/tex2xindy/tex2xindy.c xindy/tex2xindy/tex2xindy.c
---- xindy.orig/tex2xindy/tex2xindy.c	2009-11-26 20:56:54.000000000 +0100
-+++ xindy/tex2xindy/tex2xindy.c	2009-11-28 16:53:01.000000000 +0100
-@@ -668,7 +668,7 @@
- 
- /* This function quotes a character, if necessary. */
- 
--void qc( char ch ) {
-+static void qc( char ch ) {
-   switch (ch) {
-     case '\\' :
-     case '"'  :
-@@ -680,7 +680,7 @@
- 
- /* Quote an entire string. */
- 
--void qs( char* str ) {
-+static void qs( const char* str ) {
-   while ( *str ) {
-     qc( *str++ );
-   }
-@@ -691,7 +691,7 @@
-    The parameter gets passed the amount of hex digits in the ^^-notation.
-    In front of the hex digits are the same amount of ^ chars.
- */
--void omega_output_utf8 ( int width )
-+static void omega_output_utf8 ( int width )
- {
-     unsigned long int c = strtoul (yytext+width, NULL, 16);
-     if (c < 0x80) {
-@@ -2319,7 +2319,7 @@
-     return 1;
- }
- 
--void usage ()
-+static void usage (void)
- {
-     fputs("This is tex2xindy, $Revision: 1.21 $.\n", stderr);
-     fputs("usage: tex2xindy [-o] [attr_file]\n", stderr);
-diff -ur -x Makefile.in xindy.orig/tex2xindy/tex2xindy.l xindy/tex2xindy/tex2xindy.l
---- xindy.orig/tex2xindy/tex2xindy.l	2009-11-26 20:56:49.000000000 +0100
-+++ xindy/tex2xindy/tex2xindy.l	2009-11-28 16:51:41.000000000 +0100
-@@ -117,7 +117,7 @@
- 
- /* This function quotes a character, if necessary. */
- 
--void qc( char ch ) {
-+static void qc( char ch ) {
-   switch (ch) {
-     case '\\' :
-     case '"'  :
-@@ -129,7 +129,7 @@
- 
- /* Quote an entire string. */
- 
--void qs( char* str ) {
-+static void qs( const char* str ) {
-   while ( *str ) {
-     qc( *str++ );
-   }
-@@ -140,7 +140,7 @@
-    The parameter gets passed the amount of hex digits in the ^^-notation.
-    In front of the hex digits are the same amount of ^ chars.
- */
--void omega_output_utf8 ( int width )
-+static void omega_output_utf8 ( int width )
- {
-     unsigned long int c = strtoul (yytext+width, NULL, 16);
-     if (c < 0x80) {
-@@ -370,7 +370,7 @@
-     return 1;
- }
- 
--void usage ()
-+static void usage (void)
- {
-     fputs("This is tex2xindy, $Revision: 1.21 $.\n", stderr);
-     fputs("usage: tex2xindy [-o] [attr_file]\n", stderr);
diff --git a/Build/source/utils/xindy-new/xindy/Makefile.in b/Build/source/utils/xindy-new/xindy/Makefile.in
index fe11cb9691c..72a1a9e3bfb 100644
--- a/Build/source/utils/xindy-new/xindy/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/Makefile.in
@@ -33,6 +33,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 
 # do we build make-rules?
 @BUILDRULES_TRUE@am__append_1 = make-rules
@@ -181,14 +183,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/VERSION b/Build/source/utils/xindy-new/xindy/VERSION
index 74a7fa1a42f..5c72edb5319 100644
--- a/Build/source/utils/xindy-new/xindy/VERSION
+++ b/Build/source/utils/xindy-new/xindy/VERSION
@@ -1 +1 @@
-2.4-rc1
+2.4-pre2
diff --git a/Build/source/utils/xindy-new/xindy/configure.ac b/Build/source/utils/xindy-new/xindy/configure.ac
index 1a51b234edf..8ba6b024892 100644
--- a/Build/source/utils/xindy-new/xindy/configure.ac
+++ b/Build/source/utils/xindy-new/xindy/configure.ac
@@ -63,6 +63,9 @@ AC_PROG_LEX
 AC_PROG_CC
 AC_PROG_LN_S
 
+# Check system type
+AC_CANONICAL_HOST
+
 # On some systems without working iconv, we must use recode.
 AC_ARG_WITH([xindy-recode],
             AS_HELP_STRING([--with-xindy-recode],
@@ -85,12 +88,6 @@ test "$CLISP"  ||  AC_MSG_ERROR([CLISP is needed to build and run xindy])
 # No checks for header files. We use stdio.h, unistd.h, and string.h.
 # Today, they are universally available if a C compiler is installed.
 
-dnl # Check system type
-dnl # FIXME: Is that needed for TeX Live compilation? Leave it in comments...
-dnl AC_CANONICAL_HOST
-dnl AC_SUBST(host_cpu)
-dnl AC_SUBST(host_os)
-
 # Checks for typedefs, structures, and compiler characteristics.
 
 # Checks for library functions.
diff --git a/Build/source/utils/xindy-new/xindy/doc/Makefile.in b/Build/source/utils/xindy-new/xindy/doc/Makefile.in
index 684b8ea9ab1..377b9d8d8d1 100644
--- a/Build/source/utils/xindy-new/xindy/doc/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/doc/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/doc
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -172,14 +174,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy-new/xindy/doc/style-tutorial/Makefile.in
index 0dbbd3ed509..092afc264b6 100644
--- a/Build/source/utils/xindy-new/xindy/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/doc/style-tutorial/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/doc/style-tutorial
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/Makefile.in
index 7a82dec2e3d..19d52a93f90 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -148,14 +150,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
index f429aca5341..fdacb6fcf57 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
@@ -892,14 +892,24 @@ DISTCLEANFILES += \
 %-lang.xdy : %-test.xdy
 	sed -n '1,10 p' <$< >$@
 
+# Running "$(PERL) -I$(srcdir) $< $*" creates %-test.xdy, %-doc.tex, %.raw,
+# and %.xdy; %-test.xdy is finished first.  We must not run this command
+# several times simultaneously (for details see Automake manual 27.9).
 %-test.xdy : %.pl
 	$(PERL) -I$(srcdir) $< $*
 
-%-doc.tex : %.pl
-	$(PERL) -I$(srcdir) $< $*
-
-%.xdy :	%.pl
-	$(PERL) -I$(srcdir) $< $*
+%-doc.tex %.xdy : %-test.xdy
+	@if test -f $@; then :; else \
+	  trap 'rm -rf $*.lock $<' 1 2 13 15; \
+	  if mkdir $*.lock 2>/dev/null; then \
+	    rm -f $<; \
+	    $(MAKE) $(AM_MAKEFLAGS) $<; \
+	    result=$$?; rm -rf $*.lock; exit $$result; \
+	  else \
+	    while test -d $*.lock; do sleep 1; done; \
+	    test -f $<; \
+	  fi; \
+	fi
 
 SUBDIRS = \
 	albanian \
@@ -1264,5 +1274,3 @@ EXTRA_DIST = $(SCRS) test.xdy rom-comma-kludge.sed
 
 CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
 
-.NOTPARALLEL:
-
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
index 50096251a61..e3cdc551876 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -215,14 +217,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -2535,14 +2545,24 @@ romanian/cp1250.pl : romanian/utf8.pl
 %-lang.xdy : %-test.xdy
 	sed -n '1,10 p' <$< >$@
 
+# Running "$(PERL) -I$(srcdir) $< $*" creates %-test.xdy, %-doc.tex, %.raw,
+# and %.xdy; %-test.xdy is finished first.  We must not run this command
+# several times simultaneously (for details see Automake manual 27.9).
 %-test.xdy : %.pl
 	$(PERL) -I$(srcdir) $< $*
 
-%-doc.tex : %.pl
-	$(PERL) -I$(srcdir) $< $*
-
-%.xdy :	%.pl
-	$(PERL) -I$(srcdir) $< $*
+%-doc.tex %.xdy : %-test.xdy
+	@if test -f $@; then :; else \
+	  trap 'rm -rf $*.lock $<' 1 2 13 15; \
+	  if mkdir $*.lock 2>/dev/null; then \
+	    rm -f $<; \
+	    $(MAKE) $(AM_MAKEFLAGS) $<; \
+	    result=$$?; rm -rf $*.lock; exit $$result; \
+	  else \
+	    while test -d $*.lock; do sleep 1; done; \
+	    test -f $<; \
+	  fi; \
+	fi
 
 alphabets-inc.tex : $(DOCS)
 	$(RM) $@
@@ -2594,8 +2614,6 @@ alphabets-inc.tex : $(DOCS)
 @BUILDDOCS_TRUE@@BUILDRULES_TRUE@	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
 @BUILDDOCS_TRUE@@BUILDRULES_TRUE@	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
 
-.NOTPARALLEL:
-
 # 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:
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.in
index eb4b9d80fbf..3947a5e7946 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/albanian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.in
index f0017521d6b..029e8ee4afc 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/belarusian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.in
index 6b31b76f0f3..6da293e05ac 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/bulgarian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.in
index 39f2efe6b5e..d6a1e417c35 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/croatian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.in
index 9cc98abfd32..11f6c3583c3 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/czech
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.in
index a4ec339f5ac..be21d97f8df 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/danish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.in
index 60e737d7fd3..c124a10f423 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/dutch
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.in
index 13320c42094..f23d0ea32e0 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/english
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.in
index 19067e02b4a..878b0871233 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/esperanto
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.in
index 59bb08ebe00..bff2fce5260 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/estonian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.in
index 919f4bfec2d..a38fef4bf2c 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/finnish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.in
index 2b8e6dd25e4..55a6b720c97 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/french
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.in
index 9f5bc061b04..8618fd75e4f 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/general
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.in
index 73aefcb6b79..b1a6c8fe882 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/georgian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.in
index ae88b748bb9..387a56a5061 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/german
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.in
index 6b85dac5fb1..b30676459b4 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/greek
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.in
index dfe5b13b8d0..ebc37eee1f5 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/gypsy
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.in
index 6a67ebf966e..0508922f8a0 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/hausa
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.in
index 1b59957dcb2..34e57440f06 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/hebrew
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.in
index e229001d928..9ce9ef1b46a 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/hungarian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.in
index 2d4bb726847..787d2ff5833 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/icelandic
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.in
index 7d5f80aa97b..0b388f31e4f 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/italian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.in
index e08429d8e1a..089fc2056a6 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/klingon
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.in
index 86aafb92217..61501115296 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/kurdish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.in
index f00fefd31ec..4d32b7e5a86 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/latin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.in
index 43785c68d78..72b693f9c2c 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/latvian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.in
index ec913884f4f..1c74e60f761 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/lithuanian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
index 2fcf9838158..654560f45ab 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/lower-sorbian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.in
index d66f81d16b8..299c9971ffb 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/macedonian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/make-rules.pl b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/make-rules.pl
index 0855e9af999..c0f2f9c5ed2 100755
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/make-rules.pl
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/make-rules.pl
@@ -23,7 +23,10 @@ print TESTXDY "	      :rule-set (\"".$prefix."resolve-case\" \"".$prefix."ignore
 print TESTXDY "(use-rule-set :run 3\n";
 print TESTXDY "	      :rule-set (\"".$prefix."resolve-special\"))\n";
 close TESTXDY;
-$fn = "test.xdy"; $fn = "$INC[0]/$fn" if ! -f $fn && -f "$INC[0]/$fn"; die "$fn: $!" if ! -f $fn;
+
+$fn = "test.xdy";
+! -f $fn && -f "$INC[0]/$fn"  and  $fn = "$INC[0]/$fn";
+-f $fn  or  die "$fn: $!";
 system("cat $fn >> $ARGV[0]-test.xdy");
 
 $begin = 128;
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.in
index 25c05f93c19..eaa0402435a 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/mongolian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.in
index 40e1c771806..91bd9f5d8ba 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/norwegian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.in
index 4ad53d83811..0aa14c5ff54 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/polish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.in
index 57d3078222d..4d9d235723b 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/portuguese
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.in
index 1bc644b56e2..f19b4976d0e 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/romanian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.in
index 3fecdebff88..cd98e93aa5d 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/russian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.in
index fe6d6b7a0eb..40c5bfd4692 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/serbian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.in
index 6052feb65ae..e5d72cf19d9 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/slovak
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.in
index ff54db0cf20..01ea9544683 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/slovenian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.in
index 72840e28211..8e73f269234 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/spanish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.in
index a2fec88e6da..9a9e709327a 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/swedish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.in
index 6895fc29dce..b4dd0603d7d 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/test1
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.in
index fd6a9fd4ffb..5d934208592 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/turkish
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.in
index 82b0dcaa08f..3c583de5b96 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/ukrainian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
index dddc11f60c1..7832b0a0bfc 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/upper-sorbian
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.in
index 62642e2433c..04336755dcd 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/alphabets/vietnamese
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,14 +110,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in
index cc9638d33d4..b73d23dfc7a 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/inputenc/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/inputenc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/styles/Makefile.in
index 7a50533d7f4..3c6cd2863de 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/styles/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/make-rules/styles
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/Makefile.in
index e903daef229..23fbfceea88 100644
--- a/Build/source/utils/xindy-new/xindy/modules/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -148,14 +150,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/base/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/base/Makefile.in
index 36fd21490c7..b9f7c09df04 100644
--- a/Build/source/utils/xindy-new/xindy/modules/base/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/base/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/base
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/class/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/class/Makefile.in
index f24eb1753c4..ae894ee8559 100644
--- a/Build/source/utils/xindy-new/xindy/modules/class/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/class/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/class
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/lang/Makefile.in
index facdebfe2d3..9667ad30fef 100644
--- a/Build/source/utils/xindy-new/xindy/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/lang/Makefile.in
@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/lang
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -148,14 +150,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/lang/german/Makefile.in
index 04c65a26e78..307faa5da82 100644
--- a/Build/source/utils/xindy-new/xindy/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/lang/german/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/lang/german
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/lang/latin/Makefile.in
index eda22a85dcd..0c608cbc5a5 100644
--- a/Build/source/utils/xindy-new/xindy/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/lang/latin/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/lang/latin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/ord/Makefile.in
index 96e70635a5d..6a780a505ec 100644
--- a/Build/source/utils/xindy-new/xindy/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/ord/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/ord
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/rules/Makefile.in
index bddeb86ab5c..41ba710f197 100644
--- a/Build/source/utils/xindy-new/xindy/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/rules/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/rules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy-new/xindy/modules/styles/Makefile.in
index 65b25df9aeb..39023e5a414 100644
--- a/Build/source/utils/xindy-new/xindy/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/modules/styles/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/modules/styles
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/src/Makefile.am b/Build/source/utils/xindy-new/xindy/src/Makefile.am
index 7797540cf6f..d7aac1f3854 100644
--- a/Build/source/utils/xindy-new/xindy/src/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/src/Makefile.am
@@ -23,15 +23,15 @@
 # Where the modules are found at runtime.
 MODULEDIR = $(pkglibdir)/modules
 
-# Since automake has no CLISP support, we need to explicitly add make
-# rules to create the xindy kernel below and stop automake from
-# looking for C sources.
+
+# Automake has no CLISP support; moreover xindy.mem is not a binary
+# to be stripped upon 'make install-strip'.  We define it as DATA.
 mem_DATA = xindy.mem
 
 # Tell the dist target about our sources, define the object files for
 # our own rule and the .lib files for the clean definition. Don't use
 # gmake-isms.
-dist_xindy_mem_sources = base.lsp ordrules.lsp locref.lsp idxstyle.lsp \
+FASSRC                 = base.lsp ordrules.lsp locref.lsp idxstyle.lsp \
 			 index.lsp version.lsp markup.lsp
 FAS                    = base.fas ordrules.fas locref.fas idxstyle.fas \
 			 index.fas version.fas markup.fas
@@ -46,13 +46,15 @@ CLISP      = @CLISP@ -q -E iso-8859-1
 xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
 	rm -f $(MEMFILE)
 	$(CLISP) $(srcdir)/$(DUMP_XINDY)
-	gzip $(MEMFILE)
-	mv $(MEMFILE).gz $(MEMFILE)
+	if test "$(host_os)" != "mingw32"; then \
+	  gzip -9n $@; \
+	  mv $@.gz $@; \
+	fi
 
 $(DEFAULTS): $(DEFAULTS).in Makefile
 	sed 's|@MODULEDIR[@]|$(MODULEDIR)|g' <$(srcdir)/$(DEFAULTS).in >$(DEFAULTS)
 
-EXTRA_DIST = $(DEFAULTS).in $(dist_xindy_mem_sources) dump-xindy.lsp
+EXTRA_DIST = $(DEFAULTS).in $(FASSRC) dump-xindy.lsp
 
 SUFFIXES = .fas .lsp
 .lsp.fas:
diff --git a/Build/source/utils/xindy-new/xindy/src/Makefile.in b/Build/source/utils/xindy-new/xindy/src/Makefile.in
index ad033b86034..3d087c2da15 100644
--- a/Build/source/utils/xindy-new/xindy/src/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/src/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,14 +134,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -168,15 +178,14 @@ top_srcdir = @top_srcdir@
 # Where the modules are found at runtime.
 MODULEDIR = $(pkglibdir)/modules
 
-# Since automake has no CLISP support, we need to explicitly add make
-# rules to create the xindy kernel below and stop automake from
-# looking for C sources.
+# Automake has no CLISP support; moreover xindy.mem is not a binary
+# to be stripped upon 'make install-strip'.  We define it as DATA.
 mem_DATA = xindy.mem
 
 # Tell the dist target about our sources, define the object files for
 # our own rule and the .lib files for the clean definition. Don't use
 # gmake-isms.
-dist_xindy_mem_sources = base.lsp ordrules.lsp locref.lsp idxstyle.lsp \
+FASSRC = base.lsp ordrules.lsp locref.lsp idxstyle.lsp \
 			 index.lsp version.lsp markup.lsp
 
 FAS = base.fas ordrules.fas locref.fas idxstyle.fas \
@@ -188,7 +197,7 @@ FASLIBS = base.lib ordrules.lib locref.lib idxstyle.lib \
 DEFAULTS = defaults.xdy
 DUMP_XINDY = dump-xindy.lsp
 MEMFILE = xindy.mem
-EXTRA_DIST = $(DEFAULTS).in $(dist_xindy_mem_sources) dump-xindy.lsp
+EXTRA_DIST = $(DEFAULTS).in $(FASSRC) dump-xindy.lsp
 SUFFIXES = .fas .lsp
 CLEANFILES = $(FAS) $(FASLIBS) $(DEFAULTS) xindy.mem
 all: all-am
@@ -398,8 +407,10 @@ uninstall-am: uninstall-memDATA
 xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
 	rm -f $(MEMFILE)
 	$(CLISP) $(srcdir)/$(DUMP_XINDY)
-	gzip $(MEMFILE)
-	mv $(MEMFILE).gz $(MEMFILE)
+	if test "$(host_os)" != "mingw32"; then \
+	  gzip -9n $@; \
+	  mv $@.gz $@; \
+	fi
 
 $(DEFAULTS): $(DEFAULTS).in Makefile
 	sed 's|@MODULEDIR[@]|$(MODULEDIR)|g' <$(srcdir)/$(DEFAULTS).in >$(DEFAULTS)
diff --git a/Build/source/utils/xindy-new/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy-new/xindy/tex2xindy/Makefile.in
index 49156b0974e..c0d7da63e06 100644
--- a/Build/source/utils/xindy-new/xindy/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/tex2xindy/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 bin_PROGRAMS = tex2xindy$(EXEEXT)
 subdir = xindy/tex2xindy
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in tex2xindy.c
@@ -152,14 +154,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.c b/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.c
index 93c4448a3c9..9495fb7b8b0 100644
--- a/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.c
+++ b/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.c
@@ -550,7 +550,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "tex2xindy.l"
 #line 2 "tex2xindy.l"
-  /* $Id: tex2xindy.l,v 1.21 2006/07/30 09:44:04 jschrod Exp $
+  /* $Id: tex2xindy.l,v 1.23 2009/12/03 00:42:14 jschrod Exp $
      ============================================================
      (history at end)
 
@@ -680,7 +680,7 @@ static void qc( char ch ) {
 
 /* Quote an entire string. */
 
-static void qs( const char* str ) {
+static void qs( char* str ) {
   while ( *str ) {
     qc( *str++ );
   }
@@ -2311,17 +2311,9 @@ void yyfree (void * ptr )
 
 
 
-/*
- *  Define dummy yywrap so we no longer depend on `libfl.a'.
- */
-int yywrap (void)
-{
-    return 1;
-}
-
 static void usage (void)
 {
-    fputs("This is tex2xindy, $Revision: 1.21 $.\n", stderr);
+    fputs("This is tex2xindy, $Revision: 1.23 $.\n", stderr);
     fputs("usage: tex2xindy [-o] [attr_file]\n", stderr);
     exit (1);
 }
@@ -2365,9 +2357,24 @@ main(int argc, char* argv[])
 }
 
 
+/*
+ *  Define dummy yywrap so we no longer depend on `libfl.a'.
+ */
+int yywrap (void)
+{
+    return 1;
+}
+
+
 /* ============================================================
 
   $Log: tex2xindy.l,v $
+  Revision 1.23  2009/12/03 00:42:14  jschrod
+      Define internal functions as static to silence gcc warnings.
+
+  Revision 1.22  2009/12/03 00:36:09  jschrod
+      Define yywrap(), to be independent from libfl.
+
   Revision 1.21  2006/07/30 09:44:04  jschrod
       While quote is not output, escape+quote *is* output.
 
diff --git a/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.l b/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.l
index dc507aade62..b159e696dd3 100644
--- a/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.l
+++ b/Build/source/utils/xindy-new/xindy/tex2xindy/tex2xindy.l
@@ -1,5 +1,5 @@
 %{
-  /* $Id: tex2xindy.l,v 1.21 2006/07/30 09:44:04 jschrod Exp $
+  /* $Id: tex2xindy.l,v 1.23 2009/12/03 00:42:14 jschrod Exp $
      ============================================================
      (history at end)
 
@@ -129,7 +129,7 @@ static void qc( char ch ) {
 
 /* Quote an entire string. */
 
-static void qs( const char* str ) {
+static void qs( char* str ) {
   while ( *str ) {
     qc( *str++ );
   }
@@ -362,17 +362,9 @@ HATHAT32BIT	\^{8}[0-9a-fA-F]{8}
 
 %%
 
-/*
- *  Define dummy yywrap so we no longer depend on `libfl.a'.
- */
-int yywrap (void)
-{
-    return 1;
-}
-
 static void usage (void)
 {
-    fputs("This is tex2xindy, $Revision: 1.21 $.\n", stderr);
+    fputs("This is tex2xindy, $Revision: 1.23 $.\n", stderr);
     fputs("usage: tex2xindy [-o] [attr_file]\n", stderr);
     exit (1);
 }
@@ -416,9 +408,24 @@ main(int argc, char* argv[])
 }
 
 
+/*
+ *  Define dummy yywrap so we no longer depend on `libfl.a'.
+ */
+int yywrap (void)
+{
+    return 1;
+}
+
+
 /* ============================================================
 
   $Log: tex2xindy.l,v $
+  Revision 1.23  2009/12/03 00:42:14  jschrod
+      Define internal functions as static to silence gcc warnings.
+
+  Revision 1.22  2009/12/03 00:36:09  jschrod
+      Define yywrap(), to be independent from libfl.
+
   Revision 1.21  2006/07/30 09:44:04  jschrod
       While quote is not output, escape+quote *is* output.
 
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
index 88b8c0acf1f..ba066c642e2 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.am
@@ -20,10 +20,10 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-bin_SCRIPTS =
-scripts = texindy xindy xindy.v2
+scripts = texindy xindy
 
 if TEXLIVE_BUILD
+bin_SCRIPTS =
 noinst_SCRIPTS = $(scripts)
 scriptspath = texmf/scripts/xindy
 scriptsdir = ${prefix}/$(scriptspath)
@@ -51,7 +51,7 @@ uninstall-hook:
 	  rm -f $(DESTDIR)$(scriptsdir)/$$f.pl; \
 	done
 else !TEXLIVE_BUILD
-bin_SCRIPTS += $(scripts)
+bin_SCRIPTS = $(scripts) xindy.v2
 endif !TEXLIVE_BUILD
 
 xindy: xindy.in Makefile
diff --git a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
index d9cc6cb11a7..de058bdd7cf 100644
--- a/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/user-commands/Makefile.in
@@ -31,7 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-@TEXLIVE_BUILD_FALSE@am__append_1 = $(scripts)
+build_triplet = @build@
+host_triplet = @host@
 subdir = xindy/user-commands
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -136,14 +137,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -168,8 +177,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-bin_SCRIPTS = $(am__append_1)
-scripts = texindy xindy xindy.v2
+scripts = texindy xindy
+@TEXLIVE_BUILD_FALSE@bin_SCRIPTS = $(scripts) xindy.v2
+@TEXLIVE_BUILD_TRUE@bin_SCRIPTS = 
 @TEXLIVE_BUILD_TRUE@noinst_SCRIPTS = $(scripts)
 @TEXLIVE_BUILD_TRUE@scriptspath = texmf/scripts/xindy
 @TEXLIVE_BUILD_TRUE@scriptsdir = ${prefix}/$(scriptspath)
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2009-12-03 12:07:46 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2009-12-03 12:07:46 +0000
commit	86fab6d87ab71745fb879828db94aad36ccb4e0c (patch)
tree	bbbf42f3f4b5912cd14bb950a219b23685a5e420 /Build
parent	e3c587eb81f9a6d1c68694ae040791c2bd69cd3e (diff)