xindy: Add persian alphabet

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

79 files changed, 903 insertions, 203 deletions

diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index 51d1bbb7c6f..bece1919390 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Add persian alphabet. 
+	* version.ac: New file defining the xindy version.
+	* configure.ac: Adapt.
+
 2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the ../../texk/am/script_links.am fragment
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 493b454329a..ce49a3c194a 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -49,8 +49,8 @@ subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index c59bd604c5c..1f4bf702568 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -4204,7 +4204,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile xindy-2.4/Makefile xindy-2.4/src/Makefile xindy-2.4/tex2xindy/Makefile xindy-2.4/modules/Makefile xindy-2.4/modules/base/Makefile xindy-2.4/modules/class/Makefile xindy-2.4/modules/lang/Makefile xindy-2.4/modules/lang/german/Makefile xindy-2.4/modules/lang/latin/Makefile xindy-2.4/modules/ord/Makefile xindy-2.4/modules/rules/Makefile xindy-2.4/modules/styles/Makefile xindy-2.4/user-commands/Makefile xindy-2.4/make-rules/Makefile xindy-2.4/make-rules/alphabets/Makefile xindy-2.4/make-rules/alphabets/albanian/Makefile xindy-2.4/make-rules/alphabets/belarusian/Makefile xindy-2.4/make-rules/alphabets/bulgarian/Makefile xindy-2.4/make-rules/alphabets/croatian/Makefile xindy-2.4/make-rules/alphabets/czech/Makefile xindy-2.4/make-rules/alphabets/danish/Makefile xindy-2.4/make-rules/alphabets/dutch/Makefile xindy-2.4/make-rules/alphabets/english/Makefile xindy-2.4/make-rules/alphabets/esperanto/Makefile xindy-2.4/make-rules/alphabets/estonian/Makefile xindy-2.4/make-rules/alphabets/finnish/Makefile xindy-2.4/make-rules/alphabets/french/Makefile xindy-2.4/make-rules/alphabets/general/Makefile xindy-2.4/make-rules/alphabets/georgian/Makefile xindy-2.4/make-rules/alphabets/german/Makefile xindy-2.4/make-rules/alphabets/greek/Makefile xindy-2.4/make-rules/alphabets/gypsy/Makefile xindy-2.4/make-rules/alphabets/hausa/Makefile xindy-2.4/make-rules/alphabets/hebrew/Makefile xindy-2.4/make-rules/alphabets/hungarian/Makefile xindy-2.4/make-rules/alphabets/icelandic/Makefile xindy-2.4/make-rules/alphabets/italian/Makefile xindy-2.4/make-rules/alphabets/klingon/Makefile xindy-2.4/make-rules/alphabets/kurdish/Makefile xindy-2.4/make-rules/alphabets/latin/Makefile xindy-2.4/make-rules/alphabets/latvian/Makefile xindy-2.4/make-rules/alphabets/lithuanian/Makefile xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile xindy-2.4/make-rules/alphabets/macedonian/Makefile xindy-2.4/make-rules/alphabets/mongolian/Makefile xindy-2.4/make-rules/alphabets/norwegian/Makefile xindy-2.4/make-rules/alphabets/polish/Makefile xindy-2.4/make-rules/alphabets/portuguese/Makefile xindy-2.4/make-rules/alphabets/romanian/Makefile xindy-2.4/make-rules/alphabets/russian/Makefile xindy-2.4/make-rules/alphabets/serbian/Makefile xindy-2.4/make-rules/alphabets/slovak/Makefile xindy-2.4/make-rules/alphabets/slovenian/Makefile xindy-2.4/make-rules/alphabets/spanish/Makefile xindy-2.4/make-rules/alphabets/swedish/Makefile xindy-2.4/make-rules/alphabets/test1/Makefile xindy-2.4/make-rules/alphabets/turkish/Makefile xindy-2.4/make-rules/alphabets/ukrainian/Makefile xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile xindy-2.4/make-rules/alphabets/vietnamese/Makefile xindy-2.4/make-rules/inputenc/Makefile xindy-2.4/make-rules/styles/Makefile xindy-2.4/doc/Makefile xindy-2.4/doc/style-tutorial/Makefile"
+ac_config_files="$ac_config_files Makefile xindy-2.4/Makefile xindy-2.4/src/Makefile xindy-2.4/tex2xindy/Makefile xindy-2.4/modules/Makefile xindy-2.4/modules/base/Makefile xindy-2.4/modules/class/Makefile xindy-2.4/modules/lang/Makefile xindy-2.4/modules/lang/german/Makefile xindy-2.4/modules/lang/latin/Makefile xindy-2.4/modules/ord/Makefile xindy-2.4/modules/rules/Makefile xindy-2.4/modules/styles/Makefile xindy-2.4/user-commands/Makefile xindy-2.4/make-rules/Makefile xindy-2.4/make-rules/alphabets/Makefile xindy-2.4/make-rules/alphabets/albanian/Makefile xindy-2.4/make-rules/alphabets/belarusian/Makefile xindy-2.4/make-rules/alphabets/bulgarian/Makefile xindy-2.4/make-rules/alphabets/croatian/Makefile xindy-2.4/make-rules/alphabets/czech/Makefile xindy-2.4/make-rules/alphabets/danish/Makefile xindy-2.4/make-rules/alphabets/dutch/Makefile xindy-2.4/make-rules/alphabets/english/Makefile xindy-2.4/make-rules/alphabets/esperanto/Makefile xindy-2.4/make-rules/alphabets/estonian/Makefile xindy-2.4/make-rules/alphabets/finnish/Makefile xindy-2.4/make-rules/alphabets/french/Makefile xindy-2.4/make-rules/alphabets/general/Makefile xindy-2.4/make-rules/alphabets/georgian/Makefile xindy-2.4/make-rules/alphabets/german/Makefile xindy-2.4/make-rules/alphabets/greek/Makefile xindy-2.4/make-rules/alphabets/gypsy/Makefile xindy-2.4/make-rules/alphabets/hausa/Makefile xindy-2.4/make-rules/alphabets/hebrew/Makefile xindy-2.4/make-rules/alphabets/hungarian/Makefile xindy-2.4/make-rules/alphabets/icelandic/Makefile xindy-2.4/make-rules/alphabets/italian/Makefile xindy-2.4/make-rules/alphabets/klingon/Makefile xindy-2.4/make-rules/alphabets/kurdish/Makefile xindy-2.4/make-rules/alphabets/latin/Makefile xindy-2.4/make-rules/alphabets/latvian/Makefile xindy-2.4/make-rules/alphabets/lithuanian/Makefile xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile xindy-2.4/make-rules/alphabets/macedonian/Makefile xindy-2.4/make-rules/alphabets/mongolian/Makefile xindy-2.4/make-rules/alphabets/norwegian/Makefile xindy-2.4/make-rules/alphabets/persian/Makefile xindy-2.4/make-rules/alphabets/polish/Makefile xindy-2.4/make-rules/alphabets/portuguese/Makefile xindy-2.4/make-rules/alphabets/romanian/Makefile xindy-2.4/make-rules/alphabets/russian/Makefile xindy-2.4/make-rules/alphabets/serbian/Makefile xindy-2.4/make-rules/alphabets/slovak/Makefile xindy-2.4/make-rules/alphabets/slovenian/Makefile xindy-2.4/make-rules/alphabets/spanish/Makefile xindy-2.4/make-rules/alphabets/swedish/Makefile xindy-2.4/make-rules/alphabets/test1/Makefile xindy-2.4/make-rules/alphabets/turkish/Makefile xindy-2.4/make-rules/alphabets/ukrainian/Makefile xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile xindy-2.4/make-rules/alphabets/vietnamese/Makefile xindy-2.4/make-rules/inputenc/Makefile xindy-2.4/make-rules/styles/Makefile xindy-2.4/doc/Makefile xindy-2.4/doc/style-tutorial/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -5028,6 +5028,7 @@ do
     "xindy-2.4/make-rules/alphabets/macedonian/Makefile") CONFIG_FILES="$CONFIG_FILES xindy-2.4/make-rules/alphabets/macedonian/Makefile" ;;
     "xindy-2.4/make-rules/alphabets/mongolian/Makefile") CONFIG_FILES="$CONFIG_FILES xindy-2.4/make-rules/alphabets/mongolian/Makefile" ;;
     "xindy-2.4/make-rules/alphabets/norwegian/Makefile") CONFIG_FILES="$CONFIG_FILES xindy-2.4/make-rules/alphabets/norwegian/Makefile" ;;
+    "xindy-2.4/make-rules/alphabets/persian/Makefile") CONFIG_FILES="$CONFIG_FILES xindy-2.4/make-rules/alphabets/persian/Makefile" ;;
     "xindy-2.4/make-rules/alphabets/polish/Makefile") CONFIG_FILES="$CONFIG_FILES xindy-2.4/make-rules/alphabets/polish/Makefile" ;;
     "xindy-2.4/make-rules/alphabets/portuguese/Makefile") CONFIG_FILES="$CONFIG_FILES xindy-2.4/make-rules/alphabets/portuguese/Makefile" ;;
     "xindy-2.4/make-rules/alphabets/romanian/Makefile") CONFIG_FILES="$CONFIG_FILES xindy-2.4/make-rules/alphabets/romanian/Makefile" ;;
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index 34f74afb855..ae005bf410c 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@ dnl  Copyright (C) 2008,2009 by Joachim Schrod.
 dnl
 dnl *********************************************************************
 dnl
-m4_define([xindy_version], [2.4])[]dnl using unmodified xindy source tree
+m4_include([version.ac])[] dnl define xindy_version
 AC_INIT([xindy for TeX Live], xindy_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([xindy-]xindy_version[/ChangeLog.Gour])
@@ -187,6 +187,7 @@ AC_CONFIG_FILES([Makefile \
 		xindy-]xindy_version[/make-rules/alphabets/macedonian/Makefile \
 		xindy-]xindy_version[/make-rules/alphabets/mongolian/Makefile \
 		xindy-]xindy_version[/make-rules/alphabets/norwegian/Makefile \
+		xindy-]xindy_version[/make-rules/alphabets/persian/Makefile \
 		xindy-]xindy_version[/make-rules/alphabets/polish/Makefile \
 		xindy-]xindy_version[/make-rules/alphabets/portuguese/Makefile \
 		xindy-]xindy_version[/make-rules/alphabets/romanian/Makefile \
diff --git a/Build/source/utils/xindy/version.ac b/Build/source/utils/xindy/version.ac
new file mode 100644
index 00000000000..90e8dcdb554
--- /dev/null
+++ b/Build/source/utils/xindy/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current xindy version
+m4_define([xindy_version], [2.4])
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
index ae21cc039ca..83e9c9063fa 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-70-persian (new): Add persian alphabet.
+	* patch-99-future-reorg: Adapt.
+
 2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-61-detect-TL: For TL the user commands are now built and
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-70-persian b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-70-persian
new file mode 100644
index 00000000000..ae7d6ccb92c
--- /dev/null
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-70-persian
@@ -0,0 +1,173 @@
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/configure.ac xindy-2.4/configure.ac
+--- xindy-2.4.orig/configure.ac	2010-05-11 01:12:10.000000000 +0200
++++ xindy-2.4/configure.ac	2011-11-04 16:30:05.867744680 +0100
+@@ -142,6 +142,7 @@
+ 		make-rules/alphabets/macedonian/Makefile \
+ 		make-rules/alphabets/mongolian/Makefile \
+ 		make-rules/alphabets/norwegian/Makefile \
++		make-rules/alphabets/persian/Makefile \
+ 		make-rules/alphabets/polish/Makefile \
+ 		make-rules/alphabets/portuguese/Makefile \
+ 		make-rules/alphabets/romanian/Makefile \
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/Makefile.am xindy-2.4/make-rules/alphabets/Makefile.am
+--- xindy-2.4.orig/make-rules/alphabets/Makefile.am	2011-03-02 18:03:12.000000000 +0100
++++ xindy-2.4/make-rules/alphabets/Makefile.am	2011-11-04 16:52:28.025580000 +0100
+@@ -557,6 +557,18 @@
+ DISTCLEANFILES += \
+ 	norwegian/utf8.pl
+ 
++persiandir = $(langdir)/persian
++
++PERSIAN = \
++	persian/utf8-lang.xdy \
++	persian/utf8-test.xdy \
++	persian/utf8.xdy
++
++nodist_persian_DATA = $(PERSIAN)
++
++DISTCLEANFILES += \
++	persian/utf8.pl
++
+ polishdir = $(langdir)/polish
+ 
+ POLISH = \
+@@ -940,6 +952,7 @@
+ 	macedonian \
+ 	mongolian \
+ 	norwegian \
++	persian \
+ 	polish \
+ 	portuguese \
+ 	romanian \
+@@ -992,6 +1005,7 @@
+ 	$(MACEDONIAN) \
+ 	$(MONGOLIAN) \
+ 	$(NORWEGIAN) \
++	$(PERSIAN) \
+ 	$(POLISH) \
+ 	$(PORTUGUESE) \
+ 	$(ROMANIAN) \
+@@ -1176,7 +1190,8 @@
+ 	greek/utf8-doc.tex \
+ 	greek/polytonic-utf8-doc.tex \
+ 	hebrew/utf8-doc.tex \
+-	klingon/utf8-doc.tex
++	klingon/utf8-doc.tex \
++	persian/utf8-doc.tex
+ 
+ DOCS_CPS = \
+ 	$(DOCS_CP1250) \
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/persian/Makefile.am xindy-2.4/make-rules/alphabets/persian/Makefile.am
+--- xindy-2.4.orig/make-rules/alphabets/persian/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ xindy-2.4/make-rules/alphabets/persian/Makefile.am	2011-11-04 16:38:55.897313524 +0100
+@@ -0,0 +1,27 @@
++## Use `autoreconf' in top-level directory to recreate all
++## autoconf/automake files.
++## Or, call `automake Makefile' to create only Makefile.in.
++
++## Copyright (C) 2004-2005 by Gour.
++##
++## This program is free software; you can redistribute it and/or
++## modify it under the terms of the GNU General Public License as
++## published by the Free Software Foundation; either version 2 of the
++## License, or (at your option) any later version.
++##
++## This program is distributed in the hope that it will be useful, but
++## WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++## General Public License for more details.
++##
++## You should have received a copy of the GNU General Public License
++## along with this program in the file COPYING; if not, write to the
++## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++## Boston, MA 02110-1301 USA.
++
++EXTRA_DIST = utf8.pl.in
++
++CLEANFILES = \
++	utf8.raw \
++	utf8-doc.tex
++
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/persian/utf8.pl.in xindy-2.4/make-rules/alphabets/persian/utf8.pl.in
+--- xindy-2.4.orig/make-rules/alphabets/persian/utf8.pl.in	1970-01-01 01:00:00.000000000 +0100
++++ xindy-2.4/make-rules/alphabets/persian/utf8.pl.in	2011-11-04 00:07:20.000000000 +0100
+@@ -0,0 +1,79 @@
++#!/usr/bin/perl
++
++$language = "Persian";
++$prefix = "pe";
++$script = "arabic";
++
++$alphabet = [
++['ا',['أ','ا','آ']],
++['ب',['ب']],
++['پ',['پ']],
++['ت',['ت']],
++['ث',['ث']],
++['ج',['ج']],
++['چ',['چ']],
++['ح',['ح']],
++['خ',['خ']],
++['د',['د']],
++['ذ',['ذ']],
++['ر',['ر']],
++['ز',['ز']],
++['ژ',['ژ']],
++['س',['س']],
++['ش',['ش']],
++['ص',['ص']],
++['ض',['ض']],
++['ط',['ط']],
++['ظ',['ظ']],
++['ع',['ع']],
++['غ',['غ']],
++['ف',['ف']],
++['ق',['ق']],
++['ک',['ک']],
++['گ',['گ']],
++['ل',['ل']],
++['م',['م']],
++['ن',['ن']],
++['و',['ؤ','و']],
++['ه',['ه']],
++['ی',['ئ','ی']],
++['A',  ['a','A'],['à','À']],
++['B',    ['b','B']],
++['C',  ['c','C'],['ç','Ç']],
++['D',  ['d','D'],['ð','Ð']],
++['E',  ['e','E'],['é','É'],['è','È'],['ë','Ë'],['ê','Ê']],
++['F',    ['f','F']],
++['G',    ['g','G']],
++['H',    ['h','H']],
++['I',  ['i','I'],['ï','Ï']],
++['J',    ['j','J']],
++['K',    ['k','K']],
++['L',    ['l','L']],
++['M',    ['m','M']],
++['N',  ['n','N'],['ñ','Ñ']],
++['O',  ['o','O'],['ö','Ö'],['ô','Ô']],
++['P',    ['p','P']],
++['Q',    ['q','Q']],
++['R',    ['r','R']],
++['S',    ['s','S']],
++['T',    ['t','T']],
++['U',    ['u','U']],
++['V',    ['v','V']],
++['W',    ['w','W']],
++['X',    ['x','X']],
++['Y',    ['y','Y']],
++['Z',    ['z','Z']],
++['Þ',  ['þ','Þ']],
++];
++
++$sortcase = "Aa";
++#$sortcase = "aA";
++
++$ligatures = [
++[['æ','Æ'], 'after', [['a','e'], ['A','e']]],
++[['œ','Œ'], 'after', [['o','e'], ['O','e']]]
++];
++
++@special = ('?', '!', '.', 'letters', '-', '\'', '{', '}','ّ','َ','ِ','ُ','ً','ٍ','ٌ','ْ','ٔ','ء','‌','«','»','ـ');
++
++do 'make-rules.pl';
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg
index 702d6964882..ce35afcb8f7 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-99-future-reorg
@@ -14,10 +14,10 @@
 
 	Drop unused files (from TL2008 and more).
 
-diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/Makefile.am.not-yet xindy-2.4/make-rules/alphabets/Makefile.am.not-yet
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/Makefile.am.not-yet xindy-2.4/make-rules/alphabets/Makefile.am.not-yet
 --- xindy-2.4.orig/make-rules/alphabets/Makefile.am.not-yet	1970-01-01 01:00:00.000000000 +0100
-+++ xindy-2.4/make-rules/alphabets/Makefile.am.not-yet	2010-01-13 13:01:37.000000000 +0100
-@@ -0,0 +1,310 @@
++++ xindy-2.4/make-rules/alphabets/Makefile.am.not-yet	2011-11-04 17:06:18.000000000 +0100
+@@ -0,0 +1,311 @@
 +## Use `autoreconf' in top-level directory to recreate all
 +## autoconf/automake files.
 +## Or, call `automake Makefile' to create only Makefile.in.
@@ -104,6 +104,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/Ma
 +include macedonian/Makefile.am
 +include mongolian/Makefile.am
 +include norwegian/Makefile.am
++include persian/Makefile.am
 +include polish/Makefile.am
 +include portuguese/Makefile.am
 +include romanian/Makefile.am
@@ -328,10 +329,10 @@ diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/Ma
 +
 +CLEANFILES += $(nobase_nodist_lang_DATA) $(DOCS) $(DOC_CLEAN)
 +
-diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/lang.defs xindy-2.4/make-rules/alphabets/lang.defs
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/lang.defs xindy-2.4/make-rules/alphabets/lang.defs
 --- xindy-2.4.orig/make-rules/alphabets/lang.defs	1970-01-01 01:00:00.000000000 +0100
-+++ xindy-2.4/make-rules/alphabets/lang.defs	2010-01-10 22:08:23.000000000 +0100
-@@ -0,0 +1,45 @@
++++ xindy-2.4/make-rules/alphabets/lang.defs	2011-11-04 17:06:22.000000000 +0100
+@@ -0,0 +1,46 @@
 +albanian UTF8_LAT LATIN1
 +belarusian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
 +bulgarian UTF8_CYR CYR_ISO88595 CYR_KOI8_R CYR_1251
@@ -363,6 +364,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/la
 +macedonian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
 +mongolian cyrillic UTF8_CYR cyrillic
 +norwegian UTF8_LAT LATIN1
++persian UTF8_OTHER
 +polish UTF8_LAT CP1250 LATIN2
 +portuguese UTF8_LAT LATIN1
 +romanian UTF8_LAT LATIN2
@@ -377,7 +379,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/la
 +upper-sorbian UTF8_LAT CP1250 LATIN2
 +ukrainian UTF8_CYR CYR_KOI8_U CYR_1251
 +vietnamese UTF8_LAT
-diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/mk-lang.sh xindy-2.4/make-rules/alphabets/mk-lang.sh
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/mk-lang.sh xindy-2.4/make-rules/alphabets/mk-lang.sh
 --- xindy-2.4.orig/make-rules/alphabets/mk-lang.sh	1970-01-01 01:00:00.000000000 +0100
 +++ xindy-2.4/make-rules/alphabets/mk-lang.sh	2010-01-13 13:51:57.000000000 +0100
 @@ -0,0 +1,213 @@
diff --git a/Build/source/utils/xindy/xindy-2.4/Makefile.in b/Build/source/utils/xindy/xindy-2.4/Makefile.in
index 0018fa2410f..782de991f67 100644
--- a/Build/source/utils/xindy/xindy-2.4/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/Makefile.in
@@ -47,8 +47,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/configure.ac b/Build/source/utils/xindy/xindy-2.4/configure.ac
index b4ab8a0c8a7..fb4203a9a5c 100644
--- a/Build/source/utils/xindy/xindy-2.4/configure.ac
+++ b/Build/source/utils/xindy/xindy-2.4/configure.ac
@@ -142,6 +142,7 @@ AC_CONFIG_FILES([Makefile \
 		make-rules/alphabets/macedonian/Makefile \
 		make-rules/alphabets/mongolian/Makefile \
 		make-rules/alphabets/norwegian/Makefile \
+		make-rules/alphabets/persian/Makefile \
 		make-rules/alphabets/polish/Makefile \
 		make-rules/alphabets/portuguese/Makefile \
 		make-rules/alphabets/romanian/Makefile \
diff --git a/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in b/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in
index 6ad83d99eb9..002dc7a19f4 100644
--- a/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in
index 82c3b3cc4ac..bbdd054a321 100644
--- a/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in
index 50c6722523c..0569ca8027d 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am
index ac471eb87a6..29f02be4474 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am
@@ -557,6 +557,18 @@ nodist_norwegian_DATA = $(NORWEGIAN)
 DISTCLEANFILES += \
 	norwegian/utf8.pl
 
+persiandir = $(langdir)/persian
+
+PERSIAN = \
+	persian/utf8-lang.xdy \
+	persian/utf8-test.xdy \
+	persian/utf8.xdy
+
+nodist_persian_DATA = $(PERSIAN)
+
+DISTCLEANFILES += \
+	persian/utf8.pl
+
 polishdir = $(langdir)/polish
 
 POLISH = \
@@ -940,6 +952,7 @@ SUBDIRS = \
 	macedonian \
 	mongolian \
 	norwegian \
+	persian \
 	polish \
 	portuguese \
 	romanian \
@@ -992,6 +1005,7 @@ ALPHABETS = \
 	$(MACEDONIAN) \
 	$(MONGOLIAN) \
 	$(NORWEGIAN) \
+	$(PERSIAN) \
 	$(POLISH) \
 	$(PORTUGUESE) \
 	$(ROMANIAN) \
@@ -1176,7 +1190,8 @@ DOCS_UTF8_OTHER = \
 	greek/utf8-doc.tex \
 	greek/polytonic-utf8-doc.tex \
 	hebrew/utf8-doc.tex \
-	klingon/utf8-doc.tex
+	klingon/utf8-doc.tex \
+	persian/utf8-doc.tex
 
 DOCS_CPS = \
 	$(DOCS_CP1250) \
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am.not-yet b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am.not-yet
index a74be92ab9a..a7b34056fbb 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am.not-yet
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am.not-yet
@@ -84,6 +84,7 @@ include lower-sorbian/Makefile.am
 include macedonian/Makefile.am
 include mongolian/Makefile.am
 include norwegian/Makefile.am
+include persian/Makefile.am
 include polish/Makefile.am
 include portuguese/Makefile.am
 include romanian/Makefile.am
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in
index 259f63b19ff..b9f7f4abf42 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -91,13 +91,13 @@ am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(albaniandir)" \
 	"$(DESTDIR)$(latviandir)" "$(DESTDIR)$(lithuaniandir)" \
 	"$(DESTDIR)$(lower_sorbiandir)" "$(DESTDIR)$(macedoniandir)" \
 	"$(DESTDIR)$(mongoliandir)" "$(DESTDIR)$(norwegiandir)" \
-	"$(DESTDIR)$(polishdir)" "$(DESTDIR)$(portuguesedir)" \
-	"$(DESTDIR)$(romaniandir)" "$(DESTDIR)$(russiandir)" \
-	"$(DESTDIR)$(serbiandir)" "$(DESTDIR)$(slovakdir)" \
-	"$(DESTDIR)$(sloveniandir)" "$(DESTDIR)$(spanishdir)" \
-	"$(DESTDIR)$(swedishdir)" "$(DESTDIR)$(turkishdir)" \
-	"$(DESTDIR)$(ukrainiandir)" "$(DESTDIR)$(upper_sorbiandir)" \
-	"$(DESTDIR)$(vietnamesedir)"
+	"$(DESTDIR)$(persiandir)" "$(DESTDIR)$(polishdir)" \
+	"$(DESTDIR)$(portuguesedir)" "$(DESTDIR)$(romaniandir)" \
+	"$(DESTDIR)$(russiandir)" "$(DESTDIR)$(serbiandir)" \
+	"$(DESTDIR)$(slovakdir)" "$(DESTDIR)$(sloveniandir)" \
+	"$(DESTDIR)$(spanishdir)" "$(DESTDIR)$(swedishdir)" \
+	"$(DESTDIR)$(turkishdir)" "$(DESTDIR)$(ukrainiandir)" \
+	"$(DESTDIR)$(upper_sorbiandir)" "$(DESTDIR)$(vietnamesedir)"
 DATA = $(doc_DATA) $(nodist_albanian_DATA) $(nodist_belarusian_DATA) \
 	$(nodist_bulgarian_DATA) $(nodist_croatian_DATA) \
 	$(nodist_czech_DATA) $(nodist_danish_DATA) \
@@ -113,13 +113,14 @@ DATA = $(doc_DATA) $(nodist_albanian_DATA) $(nodist_belarusian_DATA) \
 	$(nodist_latin_DATA) $(nodist_latvian_DATA) \
 	$(nodist_lithuanian_DATA) $(nodist_lower_sorbian_DATA) \
 	$(nodist_macedonian_DATA) $(nodist_mongolian_DATA) \
-	$(nodist_norwegian_DATA) $(nodist_polish_DATA) \
-	$(nodist_portuguese_DATA) $(nodist_romanian_DATA) \
-	$(nodist_russian_DATA) $(nodist_serbian_DATA) \
-	$(nodist_slovak_DATA) $(nodist_slovenian_DATA) \
-	$(nodist_spanish_DATA) $(nodist_swedish_DATA) \
-	$(nodist_turkish_DATA) $(nodist_ukrainian_DATA) \
-	$(nodist_upper_sorbian_DATA) $(nodist_vietnamese_DATA)
+	$(nodist_norwegian_DATA) $(nodist_persian_DATA) \
+	$(nodist_polish_DATA) $(nodist_portuguese_DATA) \
+	$(nodist_romanian_DATA) $(nodist_russian_DATA) \
+	$(nodist_serbian_DATA) $(nodist_slovak_DATA) \
+	$(nodist_slovenian_DATA) $(nodist_spanish_DATA) \
+	$(nodist_swedish_DATA) $(nodist_turkish_DATA) \
+	$(nodist_ukrainian_DATA) $(nodist_upper_sorbian_DATA) \
+	$(nodist_vietnamese_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -275,8 +276,8 @@ DISTCLEANFILES = albanian/utf8.pl belarusian/utf8.pl bulgarian/utf8.pl \
 	klingon/utf8.pl kurdish/bedirxan-utf8.pl \
 	kurdish/turkish-i-utf8.pl latin/utf8.pl latvian/utf8.pl \
 	lithuanian/utf8.pl lower-sorbian/utf8.pl macedonian/utf8.pl \
-	mongolian/cyrillic-utf8.pl norwegian/utf8.pl polish/utf8.pl \
-	portuguese/utf8.pl romanian/utf8.pl \
+	mongolian/cyrillic-utf8.pl norwegian/utf8.pl persian/utf8.pl \
+	polish/utf8.pl portuguese/utf8.pl romanian/utf8.pl \
 	russian/translit-iso-utf8.pl russian/utf8.pl serbian/utf8.pl \
 	slovak/large-utf8.pl slovak/small-utf8.pl slovenian/utf8.pl \
 	spanish/modern-utf8.pl spanish/traditional-utf8.pl \
@@ -655,6 +656,13 @@ NORWEGIAN = \
 	norwegian/utf8.xdy
 
 nodist_norwegian_DATA = $(NORWEGIAN)
+persiandir = $(langdir)/persian
+PERSIAN = \
+	persian/utf8-lang.xdy \
+	persian/utf8-test.xdy \
+	persian/utf8.xdy
+
+nodist_persian_DATA = $(PERSIAN)
 polishdir = $(langdir)/polish
 POLISH = \
 	polish/cp1250-lang.xdy \
@@ -865,6 +873,7 @@ SUBDIRS = \
 	macedonian \
 	mongolian \
 	norwegian \
+	persian \
 	polish \
 	portuguese \
 	romanian \
@@ -917,6 +926,7 @@ ALPHABETS = \
 	$(MACEDONIAN) \
 	$(MONGOLIAN) \
 	$(NORWEGIAN) \
+	$(PERSIAN) \
 	$(POLISH) \
 	$(PORTUGUESE) \
 	$(ROMANIAN) \
@@ -1098,7 +1108,8 @@ DOCS_UTF8_OTHER = \
 	greek/utf8-doc.tex \
 	greek/polytonic-utf8-doc.tex \
 	hebrew/utf8-doc.tex \
-	klingon/utf8-doc.tex
+	klingon/utf8-doc.tex \
+	persian/utf8-doc.tex
 
 DOCS_CPS = \
 	$(DOCS_CP1250) \
@@ -1804,6 +1815,26 @@ uninstall-nodist_norwegianDATA:
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(norwegiandir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(norwegiandir)" && rm -f $$files
+install-nodist_persianDATA: $(nodist_persian_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(persiandir)" || $(MKDIR_P) "$(DESTDIR)$(persiandir)"
+	@list='$(nodist_persian_DATA)'; test -n "$(persiandir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(persiandir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(persiandir)" || exit $$?; \
+	done
+
+uninstall-nodist_persianDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_persian_DATA)'; test -n "$(persiandir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(persiandir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(persiandir)" && rm -f $$files
 install-nodist_polishDATA: $(nodist_polish_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(polishdir)" || $(MKDIR_P) "$(DESTDIR)$(polishdir)"
@@ -2263,7 +2294,7 @@ check: check-recursive
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(albaniandir)" "$(DESTDIR)$(belarusiandir)" "$(DESTDIR)$(bulgariandir)" "$(DESTDIR)$(croatiandir)" "$(DESTDIR)$(czechdir)" "$(DESTDIR)$(danishdir)" "$(DESTDIR)$(dutchdir)" "$(DESTDIR)$(englishdir)" "$(DESTDIR)$(esperantodir)" "$(DESTDIR)$(estoniandir)" "$(DESTDIR)$(finnishdir)" "$(DESTDIR)$(frenchdir)" "$(DESTDIR)$(generaldir)" "$(DESTDIR)$(georgiandir)" "$(DESTDIR)$(germandir)" "$(DESTDIR)$(greekdir)" "$(DESTDIR)$(gypsydir)" "$(DESTDIR)$(hausadir)" "$(DESTDIR)$(hebrewdir)" "$(DESTDIR)$(hungariandir)" "$(DESTDIR)$(icelandicdir)" "$(DESTDIR)$(italiandir)" "$(DESTDIR)$(klingondir)" "$(DESTDIR)$(kurdishdir)" "$(DESTDIR)$(latindir)" "$(DESTDIR)$(latviandir)" "$(DESTDIR)$(lithuaniandir)" "$(DESTDIR)$(lower_sorbiandir)" "$(DESTDIR)$(macedoniandir)" "$(DESTDIR)$(mongoliandir)" "$(DESTDIR)$(norwegiandir)" "$(DESTDIR)$(polishdir)" "$(DESTDIR)$(portuguesedir)" "$(DESTDIR)$(romaniandir)" "$(DESTDIR)$(russiandir)" "$(DESTDIR)$(serbiandir)" "$(DESTDIR)$(slovakdir)" "$(DESTDIR)$(sloveniandir)" "$(DESTDIR)$(spanishdir)" "$(DESTDIR)$(swedishdir)" "$(DESTDIR)$(turkishdir)" "$(DESTDIR)$(ukrainiandir)" "$(DESTDIR)$(upper_sorbiandir)" "$(DESTDIR)$(vietnamesedir)"; do \
+	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(albaniandir)" "$(DESTDIR)$(belarusiandir)" "$(DESTDIR)$(bulgariandir)" "$(DESTDIR)$(croatiandir)" "$(DESTDIR)$(czechdir)" "$(DESTDIR)$(danishdir)" "$(DESTDIR)$(dutchdir)" "$(DESTDIR)$(englishdir)" "$(DESTDIR)$(esperantodir)" "$(DESTDIR)$(estoniandir)" "$(DESTDIR)$(finnishdir)" "$(DESTDIR)$(frenchdir)" "$(DESTDIR)$(generaldir)" "$(DESTDIR)$(georgiandir)" "$(DESTDIR)$(germandir)" "$(DESTDIR)$(greekdir)" "$(DESTDIR)$(gypsydir)" "$(DESTDIR)$(hausadir)" "$(DESTDIR)$(hebrewdir)" "$(DESTDIR)$(hungariandir)" "$(DESTDIR)$(icelandicdir)" "$(DESTDIR)$(italiandir)" "$(DESTDIR)$(klingondir)" "$(DESTDIR)$(kurdishdir)" "$(DESTDIR)$(latindir)" "$(DESTDIR)$(latviandir)" "$(DESTDIR)$(lithuaniandir)" "$(DESTDIR)$(lower_sorbiandir)" "$(DESTDIR)$(macedoniandir)" "$(DESTDIR)$(mongoliandir)" "$(DESTDIR)$(norwegiandir)" "$(DESTDIR)$(persiandir)" "$(DESTDIR)$(polishdir)" "$(DESTDIR)$(portuguesedir)" "$(DESTDIR)$(romaniandir)" "$(DESTDIR)$(russiandir)" "$(DESTDIR)$(serbiandir)" "$(DESTDIR)$(slovakdir)" "$(DESTDIR)$(sloveniandir)" "$(DESTDIR)$(spanishdir)" "$(DESTDIR)$(swedishdir)" "$(DESTDIR)$(turkishdir)" "$(DESTDIR)$(ukrainiandir)" "$(DESTDIR)$(upper_sorbiandir)" "$(DESTDIR)$(vietnamesedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -2329,13 +2360,13 @@ install-data-am: install-docDATA install-nodist_albanianDATA \
 	install-nodist_latvianDATA install-nodist_lithuanianDATA \
 	install-nodist_lower_sorbianDATA install-nodist_macedonianDATA \
 	install-nodist_mongolianDATA install-nodist_norwegianDATA \
-	install-nodist_polishDATA install-nodist_portugueseDATA \
-	install-nodist_romanianDATA install-nodist_russianDATA \
-	install-nodist_serbianDATA install-nodist_slovakDATA \
-	install-nodist_slovenianDATA install-nodist_spanishDATA \
-	install-nodist_swedishDATA install-nodist_turkishDATA \
-	install-nodist_ukrainianDATA install-nodist_upper_sorbianDATA \
-	install-nodist_vietnameseDATA
+	install-nodist_persianDATA install-nodist_polishDATA \
+	install-nodist_portugueseDATA install-nodist_romanianDATA \
+	install-nodist_russianDATA install-nodist_serbianDATA \
+	install-nodist_slovakDATA install-nodist_slovenianDATA \
+	install-nodist_spanishDATA install-nodist_swedishDATA \
+	install-nodist_turkishDATA install-nodist_ukrainianDATA \
+	install-nodist_upper_sorbianDATA install-nodist_vietnameseDATA
 
 install-dvi: install-dvi-recursive
 
@@ -2395,12 +2426,13 @@ uninstall-am: uninstall-docDATA uninstall-nodist_albanianDATA \
 	uninstall-nodist_latvianDATA uninstall-nodist_lithuanianDATA \
 	uninstall-nodist_lower_sorbianDATA \
 	uninstall-nodist_macedonianDATA uninstall-nodist_mongolianDATA \
-	uninstall-nodist_norwegianDATA uninstall-nodist_polishDATA \
-	uninstall-nodist_portugueseDATA uninstall-nodist_romanianDATA \
-	uninstall-nodist_russianDATA uninstall-nodist_serbianDATA \
-	uninstall-nodist_slovakDATA uninstall-nodist_slovenianDATA \
-	uninstall-nodist_spanishDATA uninstall-nodist_swedishDATA \
-	uninstall-nodist_turkishDATA uninstall-nodist_ukrainianDATA \
+	uninstall-nodist_norwegianDATA uninstall-nodist_persianDATA \
+	uninstall-nodist_polishDATA uninstall-nodist_portugueseDATA \
+	uninstall-nodist_romanianDATA uninstall-nodist_russianDATA \
+	uninstall-nodist_serbianDATA uninstall-nodist_slovakDATA \
+	uninstall-nodist_slovenianDATA uninstall-nodist_spanishDATA \
+	uninstall-nodist_swedishDATA uninstall-nodist_turkishDATA \
+	uninstall-nodist_ukrainianDATA \
 	uninstall-nodist_upper_sorbianDATA \
 	uninstall-nodist_vietnameseDATA
 
@@ -2430,39 +2462,41 @@ uninstall-am: uninstall-docDATA uninstall-nodist_albanianDATA \
 	install-nodist_latvianDATA install-nodist_lithuanianDATA \
 	install-nodist_lower_sorbianDATA install-nodist_macedonianDATA \
 	install-nodist_mongolianDATA install-nodist_norwegianDATA \
-	install-nodist_polishDATA install-nodist_portugueseDATA \
-	install-nodist_romanianDATA install-nodist_russianDATA \
-	install-nodist_serbianDATA install-nodist_slovakDATA \
-	install-nodist_slovenianDATA install-nodist_spanishDATA \
-	install-nodist_swedishDATA install-nodist_turkishDATA \
-	install-nodist_ukrainianDATA install-nodist_upper_sorbianDATA \
-	install-nodist_vietnameseDATA install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-docDATA uninstall-nodist_albanianDATA \
-	uninstall-nodist_belarusianDATA uninstall-nodist_bulgarianDATA \
-	uninstall-nodist_croatianDATA uninstall-nodist_czechDATA \
-	uninstall-nodist_danishDATA uninstall-nodist_dutchDATA \
-	uninstall-nodist_englishDATA uninstall-nodist_esperantoDATA \
-	uninstall-nodist_estonianDATA uninstall-nodist_finnishDATA \
-	uninstall-nodist_frenchDATA uninstall-nodist_generalDATA \
-	uninstall-nodist_georgianDATA uninstall-nodist_germanDATA \
-	uninstall-nodist_greekDATA uninstall-nodist_gypsyDATA \
-	uninstall-nodist_hausaDATA uninstall-nodist_hebrewDATA \
-	uninstall-nodist_hungarianDATA uninstall-nodist_icelandicDATA \
-	uninstall-nodist_italianDATA uninstall-nodist_klingonDATA \
-	uninstall-nodist_kurdishDATA uninstall-nodist_latinDATA \
-	uninstall-nodist_latvianDATA uninstall-nodist_lithuanianDATA \
+	install-nodist_persianDATA install-nodist_polishDATA \
+	install-nodist_portugueseDATA install-nodist_romanianDATA \
+	install-nodist_russianDATA install-nodist_serbianDATA \
+	install-nodist_slovakDATA install-nodist_slovenianDATA \
+	install-nodist_spanishDATA install-nodist_swedishDATA \
+	install-nodist_turkishDATA install-nodist_ukrainianDATA \
+	install-nodist_upper_sorbianDATA install-nodist_vietnameseDATA \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am uninstall-docDATA \
+	uninstall-nodist_albanianDATA uninstall-nodist_belarusianDATA \
+	uninstall-nodist_bulgarianDATA uninstall-nodist_croatianDATA \
+	uninstall-nodist_czechDATA uninstall-nodist_danishDATA \
+	uninstall-nodist_dutchDATA uninstall-nodist_englishDATA \
+	uninstall-nodist_esperantoDATA uninstall-nodist_estonianDATA \
+	uninstall-nodist_finnishDATA uninstall-nodist_frenchDATA \
+	uninstall-nodist_generalDATA uninstall-nodist_georgianDATA \
+	uninstall-nodist_germanDATA uninstall-nodist_greekDATA \
+	uninstall-nodist_gypsyDATA uninstall-nodist_hausaDATA \
+	uninstall-nodist_hebrewDATA uninstall-nodist_hungarianDATA \
+	uninstall-nodist_icelandicDATA uninstall-nodist_italianDATA \
+	uninstall-nodist_klingonDATA uninstall-nodist_kurdishDATA \
+	uninstall-nodist_latinDATA uninstall-nodist_latvianDATA \
+	uninstall-nodist_lithuanianDATA \
 	uninstall-nodist_lower_sorbianDATA \
 	uninstall-nodist_macedonianDATA uninstall-nodist_mongolianDATA \
-	uninstall-nodist_norwegianDATA uninstall-nodist_polishDATA \
-	uninstall-nodist_portugueseDATA uninstall-nodist_romanianDATA \
-	uninstall-nodist_russianDATA uninstall-nodist_serbianDATA \
-	uninstall-nodist_slovakDATA uninstall-nodist_slovenianDATA \
-	uninstall-nodist_spanishDATA uninstall-nodist_swedishDATA \
-	uninstall-nodist_turkishDATA uninstall-nodist_ukrainianDATA \
+	uninstall-nodist_norwegianDATA uninstall-nodist_persianDATA \
+	uninstall-nodist_polishDATA uninstall-nodist_portugueseDATA \
+	uninstall-nodist_romanianDATA uninstall-nodist_russianDATA \
+	uninstall-nodist_serbianDATA uninstall-nodist_slovakDATA \
+	uninstall-nodist_slovenianDATA uninstall-nodist_spanishDATA \
+	uninstall-nodist_swedishDATA uninstall-nodist_turkishDATA \
+	uninstall-nodist_ukrainianDATA \
 	uninstall-nodist_upper_sorbianDATA \
 	uninstall-nodist_vietnameseDATA
 
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in
index 06f569b7977..9ce0e302e3e 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in
index f1195f5b040..fca547e650d 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in
index 243d9f38d01..a7bbbe3c6ca 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in
index 371f7284cdb..7e1ad957600 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in
index e692775fae4..4e8d19c95cc 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in
index 72843692951..afe376896ce 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in
index 247c2d1e519..a71cb6a3b5e 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in
index 77d0d0cb508..fc6b5ed8045 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in
index 09f3b99c36f..4890045e9c4 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in
index 3323e0d6e95..c3269a69734 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in
index b1537a0b098..07742c7a74b 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in
index d98957b8fe0..6e21873d031 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in
index ed768314aed..4101737c9f2 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in
index 1770ae6c286..42dd5002975 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in
index f78c9a20664..39fe54a3eee 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in
index ae853358538..98f5568ed77 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in
index 8cc09c9ccdb..75105d7ef97 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in
index 6dfde5696b2..1850666e96d 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in
index f7873e33d8f..0ff3cb755cb 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in
index 921c69669c6..26e4b7e028d 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in
index a730ed357bf..803b56af0f2 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in
index 15c0836a242..1c87048f10d 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in
index 6c63438fb35..9ee2a66f34a 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in
index f65171cb088..a82fef614f2 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lang.defs b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lang.defs
index a11fd8f3933..e15901d3703 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lang.defs
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lang.defs
@@ -29,6 +29,7 @@ lower-sorbian UTF8_LAT CP1250 LATIN2
 macedonian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
 mongolian cyrillic UTF8_CYR cyrillic
 norwegian UTF8_LAT LATIN1
+persian UTF8_OTHER
 polish UTF8_LAT CP1250 LATIN2
 portuguese UTF8_LAT LATIN1
 romanian UTF8_LAT LATIN2
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in
index 7cadc8236e4..1e25198228e 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in
index 9d2f58f82c7..49e25685019 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in
index 60342255cfc..3a50e05864b 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in
index 3daa4f98ef2..8935e280163 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in
index a6be7e16b29..50318b5bec7 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in
index 10871f577d1..d24582cd160 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in
index c74d4792c06..86229ffb9c1 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.am b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.am
new file mode 100644
index 00000000000..ba351adc36d
--- /dev/null
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.am
@@ -0,0 +1,27 @@
+## Use `autoreconf' in top-level directory to recreate all
+## autoconf/automake files.
+## Or, call `automake Makefile' to create only Makefile.in.
+
+## Copyright (C) 2004-2005 by Gour.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2 of the
+## License, or (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program in the file COPYING; if not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301 USA.
+
+EXTRA_DIST = utf8.pl.in
+
+CLEANFILES = \
+	utf8.raw \
+	utf8-doc.tex
+
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.in
new file mode 100644
index 00000000000..8ae4adbe9f1
--- /dev/null
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.in
@@ -0,0 +1,343 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = xindy-2.4/make-rules/alphabets/persian
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
+	$(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkglibdir = @pkglibdir@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLISP = @CLISP@
+CONVERT_FROM_UTF8 = @CONVERT_FROM_UTF8@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX = @LATEX@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
+PERL = @PERL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+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@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+memdir = @memdir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = utf8.pl.in
+CLEANFILES = \
+	utf8.raw \
+	utf8-doc.tex
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/make-rules/alphabets/persian/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign xindy-2.4/make-rules/alphabets/persian/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+# 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/xindy-2.4/make-rules/alphabets/persian/utf8.pl.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/utf8.pl.in
new file mode 100644
index 00000000000..480de4b4ac1
--- /dev/null
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/utf8.pl.in
@@ -0,0 +1,79 @@
+#!/usr/bin/perl
+
+$language = "Persian";
+$prefix = "pe";
+$script = "arabic";
+
+$alphabet = [
+['ا',['أ','ا','آ']],
+['ب',['ب']],
+['پ',['پ']],
+['ت',['ت']],
+['ث',['ث']],
+['ج',['ج']],
+['چ',['چ']],
+['ح',['ح']],
+['خ',['خ']],
+['د',['د']],
+['ذ',['ذ']],
+['ر',['ر']],
+['ز',['ز']],
+['ژ',['ژ']],
+['س',['س']],
+['ش',['ش']],
+['ص',['ص']],
+['ض',['ض']],
+['ط',['ط']],
+['ظ',['ظ']],
+['ع',['ع']],
+['غ',['غ']],
+['ف',['ف']],
+['ق',['ق']],
+['ک',['ک']],
+['گ',['گ']],
+['ل',['ل']],
+['م',['م']],
+['ن',['ن']],
+['و',['ؤ','و']],
+['ه',['ه']],
+['ی',['ئ','ی']],
+['A',  ['a','A'],['à','À']],
+['B',    ['b','B']],
+['C',  ['c','C'],['ç','Ç']],
+['D',  ['d','D'],['ð','Ð']],
+['E',  ['e','E'],['é','É'],['è','È'],['ë','Ë'],['ê','Ê']],
+['F',    ['f','F']],
+['G',    ['g','G']],
+['H',    ['h','H']],
+['I',  ['i','I'],['ï','Ï']],
+['J',    ['j','J']],
+['K',    ['k','K']],
+['L',    ['l','L']],
+['M',    ['m','M']],
+['N',  ['n','N'],['ñ','Ñ']],
+['O',  ['o','O'],['ö','Ö'],['ô','Ô']],
+['P',    ['p','P']],
+['Q',    ['q','Q']],
+['R',    ['r','R']],
+['S',    ['s','S']],
+['T',    ['t','T']],
+['U',    ['u','U']],
+['V',    ['v','V']],
+['W',    ['w','W']],
+['X',    ['x','X']],
+['Y',    ['y','Y']],
+['Z',    ['z','Z']],
+['Þ',  ['þ','Þ']],
+];
+
+$sortcase = "Aa";
+#$sortcase = "aA";
+
+$ligatures = [
+[['æ','Æ'], 'after', [['a','e'], ['A','e']]],
+[['œ','Œ'], 'after', [['o','e'], ['O','e']]]
+];
+
+@special = ('?', '!', '.', 'letters', '-', '\'', '{', '}','ّ','َ','ِ','ُ','ً','ٍ','ٌ','ْ','ٔ','ء','‌','«','»','ـ');
+
+do 'make-rules.pl';
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in
index 0fb14ad0c43..a16fa3363c0 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in
index ba7a2826c14..98e89bbc983 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in
index 2c03392be48..ee7fa42f7b4 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in
index 868d3b2e3fa..239b6d40641 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in
index 74566f0e9d3..ebb25d35ae6 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in
index 489f49f02ab..65e19241ff3 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in
index 84964678fd9..42e75fe0c59 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in
index c97c29b440f..4be14a261ab 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in
index 44e28ddd965..376743f9d83 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in
index 702caf4bd71..a0310c99340 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in
index 1d602744143..e781b939681 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in
index 4932f46cd91..1779980705b 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in
index b2dd446fc32..83fdd6d1004 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in
index 2e4e82d6271..b636fbdeb29 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in
index 93e7ecf8e00..3d941bd4373 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in
index 79b81758880..19990ba782a 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
index a3b3fbdbb1c..f0a66dd4df3 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in
index d9b7ee10777..ff89a96fd23 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in
index 0fc7037696f..643894ea970 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in
index 8d39f0c97e6..573b72a1162 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in
@@ -37,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in
index 8ce11b66274..5032f1dd0c4 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in
index 2cba16fbb1f..78d16cd359f 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in
index ff9041488db..a244529d6a6 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in
index b5e6cca2149..a6167eeb59c 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in
index 1dfb6b6341d..cdfe76d9b80 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/src/Makefile.in b/Build/source/utils/xindy/xindy-2.4/src/Makefile.in
index 271c946bb50..72dc7cc42b3 100644
--- a/Build/source/utils/xindy/xindy-2.4/src/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/src/Makefile.in
@@ -38,8 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in
index b3070275585..02fcf8a8a68 100644
--- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in
@@ -39,8 +39,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in tex2xindy.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in b/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in
index 5a4a8b70936..d546695892d 100644
--- a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in
@@ -39,8 +39,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d