xindy: Reorganize persian alphabet

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

12 files changed, 258 insertions, 719 deletions

diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index 728b100dc00..b703e118386 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Use Makefile fragment for persian alphabet.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 559ea3746f3..08edff7ca06 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -5152,7 +5152,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/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"
+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"
 
 
 cat >confcache <<\_ACEOF
@@ -5976,7 +5976,6 @@ 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 17fd49e7286..ed858ac1989 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -181,7 +181,6 @@ 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/xindy-2.4-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
index 3c4db307d6d..98de56b2bba 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-70-persian: Use Makefile fragment.
+
 2013-10-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-70-persian: Update persian alphabet.
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
index 39803b0c003..aa4562b4912 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-70-persian
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-70-persian
@@ -1,24 +1,37 @@
-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:06.000000000 +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	2013-10-18 12:20:00.000000000 +0200
-@@ -557,6 +557,23 @@
- DISTCLEANFILES += \
- 	norwegian/utf8.pl
++++ xindy-2.4/make-rules/alphabets/Makefile.am	2013-10-23 10:42:29.000000000 +0200
+@@ -1271,3 +1271,14 @@
  
-+persiandir = $(langdir)/persian
+ CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
+ 
++nobase_nodist_lang_DATA =
++subdirs =
++
++include persian/Makefile.am
++
++## Make sure all language subdirectories exist.
++BUILT_SOURCES = subdirs
++subdirs:
++	@for d in $(subdirs); do $(MKDIR_P) $$d; done
++.PHONY: subdirs
++
+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	2013-10-23 10:32:09.000000000 +0200
+@@ -0,0 +1,35 @@
++## Makefile fragment for alphabets/persian.
 +
-+PERSIAN = \
++## Copyright (C) 2004-2005 by Gour.
++## Copyright (C) 2009-2013 By Peter Breitenlohner <tex-live@tug.org>
++##
++## This file is free software; the copyright holders
++## give unlimited permission to copy and/or distribute it,
++## with or without modifications, as long as this notice is preserved.
++
++subdirs += persian
++
++nobase_nodist_lang_DATA += \
 +	persian/README \
 +	persian/variant1-utf8-lang.xdy \
 +	persian/variant1-utf8-test.xdy \
@@ -27,76 +40,20 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets
 +	persian/variant2-utf8-test.xdy \
 +	persian/variant2-utf8.xdy
 +
-+nodist_persian_DATA = $(PERSIAN)
-+
-+DISTCLEANFILES += \
-+	persian/variant1-utf8.pl \
-+	persian/variant2-utf8.pl
-+
- polishdir = $(langdir)/polish
- 
- POLISH = \
-@@ -940,6 +957,7 @@
- 	macedonian \
- 	mongolian \
- 	norwegian \
-+	persian \
- 	polish \
- 	portuguese \
- 	romanian \
-@@ -992,6 +1010,7 @@
- 	$(MACEDONIAN) \
- 	$(MONGOLIAN) \
- 	$(NORWEGIAN) \
-+	$(PERSIAN) \
- 	$(POLISH) \
- 	$(PORTUGUESE) \
- 	$(ROMANIAN) \
-@@ -1176,7 +1195,9 @@
- 	greek/utf8-doc.tex \
- 	greek/polytonic-utf8-doc.tex \
- 	hebrew/utf8-doc.tex \
--	klingon/utf8-doc.tex
-+	klingon/utf8-doc.tex \
++DOCS_UTF8_OTHER += \
 +	persian/variant1-utf8-doc.tex \
 +	persian/variant2-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	2013-10-18 11:18:06.000000000 +0200
-@@ -0,0 +1,31 @@
-+## 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 = \
-+	variant1-utf8.pl.in \
-+	variant2-utf8.pl.in
++EXTRA_DIST += \
++	persian/README \
++	persian/variant1-utf8.pl.in \
++	persian/variant2-utf8.pl.in
 +
-+CLEANFILES = \
-+	variant1-utf8.raw \
-+	variant1-utf8-doc.tex \
-+	variant2-utf8.raw \
-+	variant2-utf8-doc.tex
++CLEANFILES += \
++	persian/variant1-utf8.pl \
++	persian/variant1-utf8.raw \
++	persian/variant2-utf8.pl \
++	persian/variant2-utf8.raw
 +
 diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets/persian/README xindy-2.4/make-rules/alphabets/persian/README
 --- xindy-2.4.orig/make-rules/alphabets/persian/README	1970-01-01 01:00:00.000000000 +0100
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 ce35afcb8f7..bb09690b38e 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
@@ -364,7 +364,7 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/make-rules/alphabets
 +macedonian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
 +mongolian cyrillic UTF8_CYR cyrillic
 +norwegian UTF8_LAT LATIN1
-+persian UTF8_OTHER
++persian variant1 UTF8_OTHER variant2 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/configure.ac b/Build/source/utils/xindy/xindy-2.4/configure.ac
index fb4203a9a5c..b4ab8a0c8a7 100644
--- a/Build/source/utils/xindy/xindy-2.4/configure.ac
+++ b/Build/source/utils/xindy/xindy-2.4/configure.ac
@@ -142,7 +142,6 @@ 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/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.am
index cdda9d3c927..e796aed6503 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,23 +557,6 @@ nodist_norwegian_DATA = $(NORWEGIAN)
 DISTCLEANFILES += \
 	norwegian/utf8.pl
 
-persiandir = $(langdir)/persian
-
-PERSIAN = \
-	persian/README \
-	persian/variant1-utf8-lang.xdy \
-	persian/variant1-utf8-test.xdy \
-	persian/variant1-utf8.xdy \
-	persian/variant2-utf8-lang.xdy \
-	persian/variant2-utf8-test.xdy \
-	persian/variant2-utf8.xdy
-
-nodist_persian_DATA = $(PERSIAN)
-
-DISTCLEANFILES += \
-	persian/variant1-utf8.pl \
-	persian/variant2-utf8.pl
-
 polishdir = $(langdir)/polish
 
 POLISH = \
@@ -957,7 +940,6 @@ SUBDIRS = \
 	macedonian \
 	mongolian \
 	norwegian \
-	persian \
 	polish \
 	portuguese \
 	romanian \
@@ -1010,7 +992,6 @@ ALPHABETS = \
 	$(MACEDONIAN) \
 	$(MONGOLIAN) \
 	$(NORWEGIAN) \
-	$(PERSIAN) \
 	$(POLISH) \
 	$(PORTUGUESE) \
 	$(ROMANIAN) \
@@ -1195,9 +1176,7 @@ DOCS_UTF8_OTHER = \
 	greek/utf8-doc.tex \
 	greek/polytonic-utf8-doc.tex \
 	hebrew/utf8-doc.tex \
-	klingon/utf8-doc.tex \
-	persian/variant1-utf8-doc.tex \
-	persian/variant2-utf8-doc.tex
+	klingon/utf8-doc.tex
 
 DOCS_CPS = \
 	$(DOCS_CP1250) \
@@ -1292,3 +1271,14 @@ EXTRA_DIST = $(SCRS) test.xdy rom-comma-kludge.sed
 
 CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
 
+nobase_nodist_lang_DATA =
+subdirs =
+
+include persian/Makefile.am
+
+## Make sure all language subdirectories exist.
+BUILT_SOURCES = subdirs
+subdirs:
+	@for d in $(subdirs); do $(MKDIR_P) $$d; done
+.PHONY: subdirs
+
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 8850ae78422..a5bc36c49ed 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
@@ -77,8 +77,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+DIST_COMMON = $(srcdir)/persian/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am
 subdir = xindy-2.4/make-rules/alphabets
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-progs.m4 \
@@ -144,52 +145,51 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(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)" \
+am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(langdir)" \
+	"$(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)"
-DATA = $(doc_DATA) $(nodist_albanian_DATA) $(nodist_belarusian_DATA) \
-	$(nodist_bulgarian_DATA) $(nodist_croatian_DATA) \
-	$(nodist_czech_DATA) $(nodist_danish_DATA) \
-	$(nodist_dutch_DATA) $(nodist_english_DATA) \
-	$(nodist_esperanto_DATA) $(nodist_estonian_DATA) \
-	$(nodist_finnish_DATA) $(nodist_french_DATA) \
-	$(nodist_general_DATA) $(nodist_georgian_DATA) \
-	$(nodist_german_DATA) $(nodist_greek_DATA) \
-	$(nodist_gypsy_DATA) $(nodist_hausa_DATA) \
+DATA = $(doc_DATA) $(nobase_nodist_lang_DATA) $(nodist_albanian_DATA) \
+	$(nodist_belarusian_DATA) $(nodist_bulgarian_DATA) \
+	$(nodist_croatian_DATA) $(nodist_czech_DATA) \
+	$(nodist_danish_DATA) $(nodist_dutch_DATA) \
+	$(nodist_english_DATA) $(nodist_esperanto_DATA) \
+	$(nodist_estonian_DATA) $(nodist_finnish_DATA) \
+	$(nodist_french_DATA) $(nodist_general_DATA) \
+	$(nodist_georgian_DATA) $(nodist_german_DATA) \
+	$(nodist_greek_DATA) $(nodist_gypsy_DATA) $(nodist_hausa_DATA) \
 	$(nodist_hebrew_DATA) $(nodist_hungarian_DATA) \
 	$(nodist_icelandic_DATA) $(nodist_italian_DATA) \
 	$(nodist_klingon_DATA) $(nodist_kurdish_DATA) \
 	$(nodist_latin_DATA) $(nodist_latvian_DATA) \
 	$(nodist_lithuanian_DATA) $(nodist_lower_sorbian_DATA) \
 	$(nodist_macedonian_DATA) $(nodist_mongolian_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)
+	$(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)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -366,9 +366,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 \
-	persian/variant1-utf8.pl persian/variant2-utf8.pl \
-	polish/utf8.pl portuguese/utf8.pl romanian/utf8.pl \
+	mongolian/cyrillic-utf8.pl norwegian/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 \
@@ -747,17 +746,6 @@ NORWEGIAN = \
 	norwegian/utf8.xdy
 
 nodist_norwegian_DATA = $(NORWEGIAN)
-persiandir = $(langdir)/persian
-PERSIAN = \
-	persian/README \
-	persian/variant1-utf8-lang.xdy \
-	persian/variant1-utf8-test.xdy \
-	persian/variant1-utf8.xdy \
-	persian/variant2-utf8-lang.xdy \
-	persian/variant2-utf8-test.xdy \
-	persian/variant2-utf8.xdy
-
-nodist_persian_DATA = $(PERSIAN)
 polishdir = $(langdir)/polish
 POLISH = \
 	polish/cp1250-lang.xdy \
@@ -968,7 +956,6 @@ SUBDIRS = \
 	macedonian \
 	mongolian \
 	norwegian \
-	persian \
 	polish \
 	portuguese \
 	romanian \
@@ -1021,7 +1008,6 @@ ALPHABETS = \
 	$(MACEDONIAN) \
 	$(MONGOLIAN) \
 	$(NORWEGIAN) \
-	$(PERSIAN) \
 	$(POLISH) \
 	$(PORTUGUESE) \
 	$(ROMANIAN) \
@@ -1197,16 +1183,10 @@ DOCS_UTF8_CYR = \
 	serbian/utf8-doc.tex \
 	ukrainian/utf8-doc.tex
 
-DOCS_UTF8_OTHER = \
-	georgian/utf8-doc.tex \
-	german/braille-utf8-doc.tex \
-	greek/utf8-doc.tex \
-	greek/polytonic-utf8-doc.tex \
-	hebrew/utf8-doc.tex \
-	klingon/utf8-doc.tex \
-	persian/variant1-utf8-doc.tex \
-	persian/variant2-utf8-doc.tex
-
+DOCS_UTF8_OTHER = georgian/utf8-doc.tex german/braille-utf8-doc.tex \
+	greek/utf8-doc.tex greek/polytonic-utf8-doc.tex \
+	hebrew/utf8-doc.tex klingon/utf8-doc.tex \
+	persian/variant1-utf8-doc.tex persian/variant2-utf8-doc.tex
 DOCS_CPS = \
 	$(DOCS_CP1250) \
 	$(DOCS_CP1252) \
@@ -1236,12 +1216,22 @@ DOC_CLEAN = \
 	alphabets-inc.tex \
 	alphabets-doc.toc
 
-EXTRA_DIST = $(SCRS) test.xdy rom-comma-kludge.sed
-CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
-all: all-recursive
+EXTRA_DIST = $(SCRS) test.xdy rom-comma-kludge.sed persian/README \
+	persian/variant1-utf8.pl.in persian/variant2-utf8.pl.in
+CLEANFILES = $(ALPHABETS) $(DOC_CLEAN) persian/variant1-utf8.pl \
+	persian/variant1-utf8.raw persian/variant2-utf8.pl \
+	persian/variant2-utf8.raw
+nobase_nodist_lang_DATA = persian/README \
+	persian/variant1-utf8-lang.xdy persian/variant1-utf8-test.xdy \
+	persian/variant1-utf8.xdy persian/variant2-utf8-lang.xdy \
+	persian/variant2-utf8-test.xdy persian/variant2-utf8.xdy
+subdirs = persian
+BUILT_SOURCES = subdirs
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/persian/Makefile.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1262,6 +1252,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/persian/Makefile.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1292,6 +1283,30 @@ uninstall-docDATA:
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+install-nobase_nodist_langDATA: $(nobase_nodist_lang_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_nodist_lang_DATA)'; test -n "$(langdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(langdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(langdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(langdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(langdir)/$$dir"; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(langdir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(langdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_nodist_langDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_nodist_lang_DATA)'; test -n "$(langdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(langdir)'; $(am__uninstall_files_from_dir)
 install-nodist_albanianDATA: $(nodist_albanian_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(nodist_albanian_DATA)'; test -n "$(albaniandir)" || list=; \
@@ -1943,27 +1958,6 @@ uninstall-nodist_norwegianDATA:
 	@list='$(nodist_norwegian_DATA)'; test -n "$(norwegiandir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(norwegiandir)'; $(am__uninstall_files_from_dir)
-install-nodist_persianDATA: $(nodist_persian_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(nodist_persian_DATA)'; test -n "$(persiandir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(persiandir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(persiandir)" || exit 1; \
-	fi; \
-	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|^.*/||'`; \
-	dir='$(DESTDIR)$(persiandir)'; $(am__uninstall_files_from_dir)
 install-nodist_polishDATA: $(nodist_polish_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(nodist_polish_DATA)'; test -n "$(polishdir)" || list=; \
@@ -2393,14 +2387,16 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-recursive
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) 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)$(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 \
+	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(langdir)" "$(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 \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-recursive
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
@@ -2432,6 +2428,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
@@ -2452,23 +2449,23 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-docDATA install-nodist_albanianDATA \
-	install-nodist_belarusianDATA install-nodist_bulgarianDATA \
-	install-nodist_croatianDATA install-nodist_czechDATA \
-	install-nodist_danishDATA install-nodist_dutchDATA \
-	install-nodist_englishDATA install-nodist_esperantoDATA \
-	install-nodist_estonianDATA install-nodist_finnishDATA \
-	install-nodist_frenchDATA install-nodist_generalDATA \
-	install-nodist_georgianDATA install-nodist_germanDATA \
-	install-nodist_greekDATA install-nodist_gypsyDATA \
-	install-nodist_hausaDATA install-nodist_hebrewDATA \
-	install-nodist_hungarianDATA install-nodist_icelandicDATA \
-	install-nodist_italianDATA install-nodist_klingonDATA \
-	install-nodist_kurdishDATA install-nodist_latinDATA \
-	install-nodist_latvianDATA install-nodist_lithuanianDATA \
-	install-nodist_lower_sorbianDATA install-nodist_macedonianDATA \
-	install-nodist_mongolianDATA install-nodist_norwegianDATA \
-	install-nodist_persianDATA install-nodist_polishDATA \
+install-data-am: install-docDATA install-nobase_nodist_langDATA \
+	install-nodist_albanianDATA install-nodist_belarusianDATA \
+	install-nodist_bulgarianDATA install-nodist_croatianDATA \
+	install-nodist_czechDATA install-nodist_danishDATA \
+	install-nodist_dutchDATA install-nodist_englishDATA \
+	install-nodist_esperantoDATA install-nodist_estonianDATA \
+	install-nodist_finnishDATA install-nodist_frenchDATA \
+	install-nodist_generalDATA install-nodist_georgianDATA \
+	install-nodist_germanDATA install-nodist_greekDATA \
+	install-nodist_gypsyDATA install-nodist_hausaDATA \
+	install-nodist_hebrewDATA install-nodist_hungarianDATA \
+	install-nodist_icelandicDATA install-nodist_italianDATA \
+	install-nodist_klingonDATA install-nodist_kurdishDATA \
+	install-nodist_latinDATA 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 \
@@ -2518,33 +2515,34 @@ ps: ps-recursive
 
 ps-am:
 
-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-am: uninstall-docDATA uninstall-nobase_nodist_langDATA \
+	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_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_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_upper_sorbianDATA \
 	uninstall-nodist_vietnameseDATA
 
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic cscopelist-am ctags ctags-am \
@@ -2553,22 +2551,22 @@ uninstall-am: uninstall-docDATA uninstall-nodist_albanianDATA \
 	install-data-am install-docDATA install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man \
-	install-nodist_albanianDATA install-nodist_belarusianDATA \
-	install-nodist_bulgarianDATA install-nodist_croatianDATA \
-	install-nodist_czechDATA install-nodist_danishDATA \
-	install-nodist_dutchDATA install-nodist_englishDATA \
-	install-nodist_esperantoDATA install-nodist_estonianDATA \
-	install-nodist_finnishDATA install-nodist_frenchDATA \
-	install-nodist_generalDATA install-nodist_georgianDATA \
-	install-nodist_germanDATA install-nodist_greekDATA \
-	install-nodist_gypsyDATA install-nodist_hausaDATA \
-	install-nodist_hebrewDATA install-nodist_hungarianDATA \
-	install-nodist_icelandicDATA install-nodist_italianDATA \
-	install-nodist_klingonDATA install-nodist_kurdishDATA \
-	install-nodist_latinDATA install-nodist_latvianDATA \
-	install-nodist_lithuanianDATA install-nodist_lower_sorbianDATA \
-	install-nodist_macedonianDATA install-nodist_mongolianDATA \
-	install-nodist_norwegianDATA install-nodist_persianDATA \
+	install-nobase_nodist_langDATA install-nodist_albanianDATA \
+	install-nodist_belarusianDATA install-nodist_bulgarianDATA \
+	install-nodist_croatianDATA install-nodist_czechDATA \
+	install-nodist_danishDATA install-nodist_dutchDATA \
+	install-nodist_englishDATA install-nodist_esperantoDATA \
+	install-nodist_estonianDATA install-nodist_finnishDATA \
+	install-nodist_frenchDATA install-nodist_generalDATA \
+	install-nodist_georgianDATA install-nodist_germanDATA \
+	install-nodist_greekDATA install-nodist_gypsyDATA \
+	install-nodist_hausaDATA install-nodist_hebrewDATA \
+	install-nodist_hungarianDATA install-nodist_icelandicDATA \
+	install-nodist_italianDATA install-nodist_klingonDATA \
+	install-nodist_kurdishDATA install-nodist_latinDATA \
+	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 \
@@ -2580,29 +2578,29 @@ uninstall-am: uninstall-docDATA uninstall-nodist_albanianDATA \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-am 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-docDATA uninstall-nobase_nodist_langDATA \
+	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_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_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_upper_sorbianDATA \
 	uninstall-nodist_vietnameseDATA
 
@@ -2756,6 +2754,9 @@ alphabets-inc.tex : $(DOCS)
 @BUILDDOCS_TRUE@@BUILDRULES_TRUE@alphabets-doc.pdf : alphabets-doc.tex alphabets-inc.tex
 @BUILDDOCS_TRUE@@BUILDRULES_TRUE@	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
 @BUILDDOCS_TRUE@@BUILDRULES_TRUE@	pdflatex -interaction batchmode $(srcdir)/alphabets-doc.tex
+subdirs:
+	@for d in $(subdirs); do $(MKDIR_P) $$d; done
+.PHONY: subdirs
 
 # 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.
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 e15901d3703..b680d904b95 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,7 +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
+persian variant1 UTF8_OTHER variant2 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/persian/Makefile.am b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.am
index 6ddbae6458f..fecb27e775a 100644
--- 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
@@ -1,31 +1,35 @@
-## Use `autoreconf' in top-level directory to recreate all
-## autoconf/automake files.
-## Or, call `automake Makefile' to create only Makefile.in.
+## Makefile fragment for alphabets/persian.
 
 ## Copyright (C) 2004-2005 by Gour.
+## Copyright (C) 2009-2013 By Peter Breitenlohner <tex-live@tug.org>
 ##
-## 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.
+## This file is free software; the copyright holders
+## give unlimited permission to copy and/or distribute it,
+## with or without modifications, as long as this notice is preserved.
+
+subdirs += persian
+
+nobase_nodist_lang_DATA += \
+	persian/README \
+	persian/variant1-utf8-lang.xdy \
+	persian/variant1-utf8-test.xdy \
+	persian/variant1-utf8.xdy \
+	persian/variant2-utf8-lang.xdy \
+	persian/variant2-utf8-test.xdy \
+	persian/variant2-utf8.xdy
+
+DOCS_UTF8_OTHER += \
+	persian/variant1-utf8-doc.tex \
+	persian/variant2-utf8-doc.tex
 
-EXTRA_DIST = \
-	variant1-utf8.pl.in \
-	variant2-utf8.pl.in
+EXTRA_DIST += \
+	persian/README \
+	persian/variant1-utf8.pl.in \
+	persian/variant2-utf8.pl.in
 
-CLEANFILES = \
-	variant1-utf8.raw \
-	variant1-utf8-doc.tex \
-	variant2-utf8.raw \
-	variant2-utf8-doc.tex
+CLEANFILES += \
+	persian/variant1-utf8.pl \
+	persian/variant1-utf8.raw \
+	persian/variant2-utf8.pl \
+	persian/variant2-utf8.raw
 
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
deleted file mode 100644
index 70c51e00f37..00000000000
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/persian/Makefile.in
+++ /dev/null
@@ -1,418 +0,0 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 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@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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.in $(srcdir)/Makefile.am README
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
-	$(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 =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibdir = @pkglibdir@
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-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 = \
-	variant1-utf8.pl.in \
-	variant2-utf8.pl.in
-
-CLEANFILES = \
-	variant1-utf8.raw \
-	variant1-utf8-doc.tex \
-	variant2-utf8.raw \
-	variant2-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:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-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:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-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 cscopelist-am \
-	ctags-am 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 tags-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: