utils/xindy-new/ build system: add generated .pl files

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

55 files changed, 4313 insertions, 2802 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index b695eed9d82..d345cc5e1f1 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1120,8 +1120,8 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	tests/rptmr.tfm tests/story.dvi tests/testex.err \
 	tests/testex.mp tests/testex.tex tests/translate tests/uno.dos \
 	tests/write18.tex tests/xampl.bib ctiedir tiedir \
-	lib/mfmpi386.asm lib/mfmpw32.c tests/common-test.pl \
-	lib/texmfmp.c texmfmem.h texmfmp-help.h texmfmp.h \
+	lib/mfmpi386.asm lib/mfmpw32.c lib/texmfmp.c \
+	tests/common-test.pl texmfmem.h texmfmp-help.h texmfmp.h \
 	$(tex_ch_srcs) lib/texmfmp.c tmf-pool.h $(tex_tests) \
 	tests/write18-quote.tex mf.web mf-binpool.ch mf.ch mftalk.h \
 	lib/texmfmp.c tmf-pool.h $(mf_tests) triptrap/README \
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 3da2e5ac292..df70cfc1428 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -7,8 +7,8 @@
 EXTRA_DIST += \
 	lib/mfmpi386.asm \
 	lib/mfmpw32.c \
-	tests/common-test.pl \
 	lib/texmfmp.c \
+	tests/common-test.pl \
 	texmfmem.h \
 	texmfmp-help.h \
 	texmfmp.h
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
index 7bbb2c2f8e2..91954ccbde7 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ../xindy/make-rules/alphabets/{mk-lang.sh,lang.defs}:
+	New files to automatically generate the
+	../xindy/make-rules/alphabets/*/Makefile.am fragments.
+	* patch-50-reorg-alphabets: Reintroduce generated .pl files.
+	* patch-50-reorg-alphabets-generated (new): Generated fragments.
+
 2009-12-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-03-iconv-typo (new): Fix typo in iconv-or-recode patch.
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
index 3b0b52e8b1f..73208b735bc 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/TL-Changes
@@ -17,12 +17,11 @@ Moved user-commands/texindy => user-commands/texindy.in and removed
 
 Removed:
 	make-rules/alphabets/*/*.xdy
-	modules/*/{,*/}Makefile.{am,in}
 
-Removed:
-	make-rules/alphabets/*/*.pl
-except
-	make-rules/alphabets/general/template.pl
-	make-rules/alphabets/klingon/translit-ascii.pl
-	make-rules/alphabets/test1/test1.pl
+Added :
+	make-rules/alphabets/mk-lang.sh
+	make-rules/alphabets/lang.defs
+
+Executed 'sh mk-lang.sh' to rebuild the Makefile fragments
+	make-rules/alphabets/*/Makefile.am
 
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-50-reorg-alphabets b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-50-reorg-alphabets
index 9fabe90cec0..3aee7deff38 100644
--- a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-50-reorg-alphabets
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-50-reorg-alphabets
@@ -7,9 +7,11 @@
 	The idea is to put everything specific for a language into
 	the Makefile.am fragment for that language.
 
+	The fragments are (re-)generated by running 'sh mk-lang.sh'
+	(in make-rules/alphabets).
+
 	========
 
-	Do not distribute generated files (copied from TL2008).
 	Drop unused files (from TL2008 amd more).
 
 diff -ur -x Makefile.in -x autom4te.cache xindy.orig/configure.ac xindy/configure.ac
@@ -69,13 +71,14 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/configure.ac xindy/configur
  		doc/Makefile \
 diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefile.am xindy/make-rules/alphabets/Makefile.am
 --- xindy.orig/make-rules/alphabets/Makefile.am	2009-12-02 20:34:28.000000000 +0100
-+++ xindy/make-rules/alphabets/Makefile.am	2010-01-10 18:40:52.000000000 +0100
-@@ -21,787 +21,88 @@
++++ xindy/make-rules/alphabets/Makefile.am	2010-01-13 13:01:37.000000000 +0100
+@@ -21,787 +21,89 @@
  
  langdir	= $(pkglibdir)/modules/lang
  
 -DISTCLEANFILES =
 +nobase_nodist_lang_DATA =
++dist_noinst_DATA =
  
 -albaniandir = $(langdir)/albanian
 -
@@ -879,7 +882,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
 +DOCS_UTF8_CYR =
 +DOCS_UTF8_OTHER =
 +
-+EXTRA_DIST =
++EXTRA_DIST = mk-lang.sh lang.defs
 +CLEANFILES =
 +
 +subdirs =
@@ -939,7 +942,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
  
  %utf8.pl : %utf8.pl.in
  	sed -e 's/@.{\([^}]*\)}/\1/g;' <$< >$@
-@@ -814,13 +115,6 @@
+@@ -814,13 +116,6 @@
  	sed -e 's/@.{\([^}]*\)}//g;' <$< | \
  	$(CONVERT_FROM_UTF8)CP850 >$@
  
@@ -953,7 +956,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
  %latin2.pl : %utf8.pl.in
  	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
  	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
-@@ -853,13 +147,6 @@
+@@ -853,13 +148,6 @@
  	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
  	$(CONVERT_FROM_UTF8)ISO-8859-15 >$@
  
@@ -967,7 +970,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
  %cp1250.pl : %utf8.pl.in
  	sed -e 's/@u{\([^}]*\)}//g;' <$< | \
  	$(CONVERT_FROM_UTF8)CP1250 >$@
-@@ -911,203 +198,11 @@
+@@ -911,203 +199,11 @@
  	  fi; \
  	fi
  
@@ -1171,7 +1174,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
  DOCS_CYR = \
  	$(DOCS_CYR_1251) \
  	$(DOCS_CYR_ISO88595) \
-@@ -1115,72 +210,6 @@
+@@ -1115,72 +211,6 @@
  	$(DOCS_CYR_KOI8_R) \
  	$(DOCS_CYR_KOI8_U)
  
@@ -1244,7 +1247,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
  DOCS_CPS = \
  	$(DOCS_CP1250) \
  	$(DOCS_CP1252) \
-@@ -1194,6 +223,10 @@
+@@ -1194,6 +224,10 @@
  	$(DOCS_LATIN5) \
  	$(DOCS_LATIN9)
  
@@ -1255,7 +1258,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
  DOCS_UTF8 = \
  	$(DOCS_UTF8_LAT) \
  	$(DOCS_UTF8_CYR) \
-@@ -1270,7 +303,7 @@
+@@ -1270,7 +304,7 @@
  	alphabets-inc.tex \
  	alphabets-doc.toc
  
@@ -1265,2213 +1268,269 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
 -CLEANFILES = $(ALPHABETS) $(DOC_CLEAN)
 +CLEANFILES += $(nobase_nodist_lang_DATA) $(DOCS) $(DOC_CLEAN)
  
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/albanian/Makefile.am xindy/make-rules/alphabets/albanian/Makefile.am
---- xindy.orig/make-rules/alphabets/albanian/Makefile.am	2008-01-09 15:01:31.000000000 +0100
-+++ xindy/make-rules/alphabets/albanian/Makefile.am	2009-12-17 20:41:39.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for albanian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin1.pl utf8.pl.in
-+subdirs += albanian
- 
--CLEANFILES = \
--	latin1.raw \
--	latin1-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	albanian/latin1-lang.xdy albanian/latin1-test.xdy albanian/latin1.xdy \
-+	albanian/utf8-lang.xdy albanian/utf8-test.xdy albanian/utf8.xdy
- 
-+DOCS_LATIN1 += \
-+	albanian/latin1-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	albanian/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	albanian/utf8.pl.in
-+
-+CLEANFILES += \
-+	albanian/latin1.pl albanian/latin1.raw \
-+	albanian/utf8.pl albanian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/belarusian/Makefile.am xindy/make-rules/alphabets/belarusian/Makefile.am
---- xindy.orig/make-rules/alphabets/belarusian/Makefile.am	2008-01-09 15:01:30.000000000 +0100
-+++ xindy/make-rules/alphabets/belarusian/Makefile.am	2009-12-17 20:42:46.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for belarusian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,19 +18,32 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1251.pl iso88595.pl isoir111.pl utf8.pl.in
--
--CLEANFILES = \
--	cp1251.raw \
--	cp1251-doc.tex \
--	iso88595.raw \
--	iso88595-doc.tex \
--	isoir111.raw \
--	isoir111-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
--
-+subdirs += belarusian
- 
-+nobase_nodist_lang_DATA += \
-+	belarusian/cp1251-lang.xdy belarusian/cp1251-test.xdy belarusian/cp1251.xdy \
-+	belarusian/iso88595-lang.xdy belarusian/iso88595-test.xdy belarusian/iso88595.xdy \
-+	belarusian/isoir111-lang.xdy belarusian/isoir111-test.xdy belarusian/isoir111.xdy \
-+	belarusian/utf8-lang.xdy belarusian/utf8-test.xdy belarusian/utf8.xdy
-+
-+DOCS_CYR_1251 += \
-+	belarusian/cp1251-doc.tex
-+
-+DOCS_CYR_ISO88595 += \
-+	belarusian/iso88595-doc.tex
-+
-+DOCS_CYR_ISOIR111 += \
-+	belarusian/isoir111-doc.tex
-+
-+DOCS_UTF8_CYR += \
-+	belarusian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	belarusian/utf8.pl.in
-+
-+CLEANFILES += \
-+	belarusian/cp1251.pl belarusian/cp1251.raw \
-+	belarusian/iso88595.pl belarusian/iso88595.raw \
-+	belarusian/isoir111.pl belarusian/isoir111.raw \
-+	belarusian/utf8.pl belarusian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/bulgarian/Makefile.am xindy/make-rules/alphabets/bulgarian/Makefile.am
---- xindy.orig/make-rules/alphabets/bulgarian/Makefile.am	2008-01-09 15:01:30.000000000 +0100
-+++ xindy/make-rules/alphabets/bulgarian/Makefile.am	2010-01-10 23:24:40.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for bulgarian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,19 +18,32 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1251.pl iso88595.pl koi8-r.pl utf8.pl.in
--
--
--CLEANFILES = \
--	cp1251.raw \
--	cp1251-doc.tex \
--	iso88595.raw \
--	iso88595-doc.tex \
--	koi8-r.raw \
--	koi8-r-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
-+subdirs += bulgarian
- 
-+nobase_nodist_lang_DATA += \
-+	bulgarian/cp1251-lang.xdy bulgarian/cp1251-test.xdy bulgarian/cp1251.xdy \
-+	bulgarian/iso88595-lang.xdy bulgarian/iso88595-test.xdy bulgarian/iso88595.xdy \
-+	bulgarian/koi8-r-lang.xdy bulgarian/koi8-r-test.xdy bulgarian/koi8-r.xdy \
-+	bulgarian/utf8-lang.xdy bulgarian/utf8-test.xdy bulgarian/utf8.xdy
-+
-+DOCS_CYR_1251 += \
-+	bulgarian/cp1251-doc.tex
-+
-+DOCS_CYR_ISO88595 += \
-+	bulgarian/iso88595-doc.tex
-+
-+DOCS_CYR_KOI8_R += \
-+	bulgarian/koi8-r-doc.tex
-+
-+DOCS_UTF8_CYR += \
-+	bulgarian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	bulgarian/utf8.pl.in
-+
-+CLEANFILES += \
-+	bulgarian/cp1251.pl bulgarian/cp1251.raw \
-+	bulgarian/iso88595.pl bulgarian/iso88595.raw \
-+	bulgarian/koi8-r.pl bulgarian/koi8-r.raw \
-+	bulgarian/utf8.pl bulgarian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/croatian/Makefile.am xindy/make-rules/alphabets/croatian/Makefile.am
---- xindy.orig/make-rules/alphabets/croatian/Makefile.am	2008-01-09 15:01:29.000000000 +0100
-+++ xindy/make-rules/alphabets/croatian/Makefile.am	2009-12-17 20:44:31.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for croatian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
-+subdirs += croatian
- 
--CLEANFILES = \
--	cp1250.raw \
--	cp1250-doc.tex \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	croatian/cp1250-lang.xdy croatian/cp1250-test.xdy croatian/cp1250.xdy \
-+	croatian/latin2-lang.xdy croatian/latin2-test.xdy croatian/latin2.xdy \
-+	croatian/utf8-lang.xdy croatian/utf8-test.xdy croatian/utf8.xdy
- 
-+DOCS_CP1250 += \
-+	croatian/cp1250-doc.tex
- 
-+DOCS_LATIN2 += \
-+	croatian/latin2-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	croatian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	croatian/utf8.pl.in
-+
-+CLEANFILES += \
-+	croatian/cp1250.pl croatian/cp1250.raw \
-+	croatian/latin2.pl croatian/latin2.raw \
-+	croatian/utf8.pl croatian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/czech/Makefile.am xindy/make-rules/alphabets/czech/Makefile.am
---- xindy.orig/make-rules/alphabets/czech/Makefile.am	2008-01-09 15:01:29.000000000 +0100
-+++ xindy/make-rules/alphabets/czech/Makefile.am	2009-12-17 20:45:08.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for czech.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
-+subdirs += czech
- 
--CLEANFILES = \
--	cp1250.raw \
--	cp1250-doc.tex \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	czech/cp1250-lang.xdy czech/cp1250-test.xdy czech/cp1250.xdy \
-+	czech/latin2-lang.xdy czech/latin2-test.xdy czech/latin2.xdy \
-+	czech/utf8-lang.xdy czech/utf8-test.xdy czech/utf8.xdy
- 
-+DOCS_CP1250 += \
-+	czech/cp1250-doc.tex
- 
-+DOCS_LATIN2 += \
-+	czech/latin2-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	czech/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	czech/utf8.pl.in
-+
-+CLEANFILES += \
-+	czech/cp1250.pl czech/cp1250.raw \
-+	czech/latin2.pl czech/latin2.raw \
-+	czech/utf8.pl czech/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/danish/Makefile.am xindy/make-rules/alphabets/danish/Makefile.am
---- xindy.orig/make-rules/alphabets/danish/Makefile.am	2008-01-09 15:01:28.000000000 +0100
-+++ xindy/make-rules/alphabets/danish/Makefile.am	2009-12-17 20:45:50.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for danish.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,19 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--    cp1252.pl latin9.pl utf8.pl.in \
--    latin1.xdy
-+subdirs += danish
- 
-+nobase_nodist_lang_DATA += \
-+	danish/cp1252-lang.xdy danish/cp1252-test.xdy danish/cp1252.xdy \
-+	danish/latin9-lang.xdy danish/latin9-test.xdy danish/latin9.xdy \
-+	danish/utf8-lang.xdy danish/utf8-test.xdy danish/utf8.xdy
- 
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	latin9.raw \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+DOCS_CP1252 += \
-+	danish/cp1252-doc.tex
- 
-+DOCS_LATIN9 += \
-+	danish/latin9-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	danish/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	danish/utf8.pl.in
-+
-+CLEANFILES += \
-+	danish/cp1252.pl danish/cp1252.raw \
-+	danish/latin9.pl danish/latin9.raw \
-+	danish/utf8.pl danish/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/dutch/Makefile.am xindy/make-rules/alphabets/dutch/Makefile.am
---- xindy.orig/make-rules/alphabets/dutch/Makefile.am	2008-01-09 15:01:27.000000000 +0100
-+++ xindy/make-rules/alphabets/dutch/Makefile.am	2009-12-17 20:47:48.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for dutch.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,18 +18,26 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	ij-as-ij-latin1.pl ij-as-y-utf8.pl.in ij-as-ij-utf8.pl.in \
--	latin1.xdy tex-latin1.xdy
--
--CLEANFILES = \
--	ij-as-ij-latin1.raw \
--	ij-as-ij-latin1-doc.tex \
--	ij-as-ij-utf8.raw \
--	ij-as-ij-utf8-doc.tex \
--	ij-as-y-utf8.raw \
--	ij-as-y-utf8-doc.tex
--
--
-+subdirs += dutch
- 
-+nobase_nodist_lang_DATA += \
-+	dutch/ij-as-ij-latin1-lang.xdy dutch/ij-as-ij-latin1-test.xdy dutch/ij-as-ij-latin1.xdy \
-+	dutch/ij-as-ij-utf8-lang.xdy dutch/ij-as-ij-utf8-test.xdy dutch/ij-as-ij-utf8.xdy \
-+	dutch/ij-as-y-utf8-lang.xdy dutch/ij-as-y-utf8-test.xdy dutch/ij-as-y-utf8.xdy
-+
-+DOCS_LATIN1 += \
-+	dutch/ij-as-ij-latin1-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	dutch/ij-as-ij-utf8-doc.tex \
-+	dutch/ij-as-y-utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	dutch/ij-as-ij-utf8.pl.in \
-+	dutch/ij-as-y-utf8.pl.in
-+
-+CLEANFILES += \
-+	dutch/ij-as-ij-latin1.pl dutch/ij-as-ij-latin1.raw \
-+	dutch/ij-as-ij-utf8.pl dutch/ij-as-ij-utf8.raw \
-+	dutch/ij-as-y-utf8.pl dutch/ij-as-y-utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/english/Makefile.am xindy/make-rules/alphabets/english/Makefile.am
---- xindy.orig/make-rules/alphabets/english/Makefile.am	2008-01-09 15:01:27.000000000 +0100
-+++ xindy/make-rules/alphabets/english/Makefile.am	2009-12-17 20:48:26.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for english.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,18 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	cp1252.pl latin9.pl  utf8.pl.in \
--	ascii.xdy tex-ascii.xdy
--
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	latin9.raw  \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+subdirs += english
- 
-+nobase_nodist_lang_DATA += \
-+	english/cp1252-lang.xdy english/cp1252-test.xdy english/cp1252.xdy \
-+	english/latin9-lang.xdy  english/latin9-test.xdy english/latin9.xdy \
-+	english/utf8-lang.xdy english/utf8-test.xdy english/utf8.xdy
- 
-+DOCS_CP1252 += \
-+	english/cp1252-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	english/utf8-doc.tex
-+
-+DOCS_LATIN9 += \
-+	english/latin9-doc.tex
-+
-+EXTRA_DIST += \
-+	english/utf8.pl.in
-+
-+CLEANFILES += \
-+	english/cp1252.pl english/cp1252.raw \
-+	english/latin9.pl english/latin9.raw  \
-+	english/utf8.pl english/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/esperanto/Makefile.am xindy/make-rules/alphabets/esperanto/Makefile.am
---- xindy.orig/make-rules/alphabets/esperanto/Makefile.am	2008-01-09 15:01:26.000000000 +0100
-+++ xindy/make-rules/alphabets/esperanto/Makefile.am	2009-12-17 20:48:53.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for esperanto.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin3.pl utf8.pl.in
-+subdirs += esperanto
- 
--CLEANFILES = \
--	latin3.raw \
--	latin3-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	esperanto/latin3-lang.xdy esperanto/latin3-test.xdy esperanto/latin3.xdy \
-+	esperanto/utf8-lang.xdy esperanto/utf8-test.xdy esperanto/utf8.xdy
- 
-+DOCS_LATIN3 += \
-+	esperanto/latin3-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	esperanto/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	esperanto/utf8.pl.in
-+
-+CLEANFILES += \
-+	esperanto/latin3.pl esperanto/latin3.raw \
-+	esperanto/utf8.pl esperanto/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/estonian/Makefile.am xindy/make-rules/alphabets/estonian/Makefile.am
---- xindy.orig/make-rules/alphabets/estonian/Makefile.am	2008-01-09 15:01:26.000000000 +0100
-+++ xindy/make-rules/alphabets/estonian/Makefile.am	2009-12-17 20:49:33.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for estonian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1252.pl latin9.pl utf8.pl.in
-+subdirs += estonian
- 
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	latin9.raw \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	estonian/cp1252-lang.xdy estonian/cp1252-test.xdy estonian/cp1252.xdy \
-+	estonian/latin9-lang.xdy estonian/latin9-test.xdy estonian/latin9.xdy \
-+	estonian/utf8-lang.xdy estonian/utf8-test.xdy estonian/utf8.xdy
- 
-+DOCS_CP1252 += \
-+	estonian/cp1252-doc.tex
- 
-+DOCS_LATIN9 += \
-+	estonian/latin9-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	estonian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	estonian/utf8.pl.in
-+
-+CLEANFILES += \
-+	estonian/cp1252.pl estonian/cp1252.raw \
-+	estonian/latin9.pl estonian/latin9.raw \
-+	estonian/utf8.pl estonian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/finnish/Makefile.am xindy/make-rules/alphabets/finnish/Makefile.am
---- xindy.orig/make-rules/alphabets/finnish/Makefile.am	2008-01-09 15:01:26.000000000 +0100
-+++ xindy/make-rules/alphabets/finnish/Makefile.am	2009-12-17 20:52:37.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for finnish.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,19 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	cp1252.pl latin9.pl utf8.pl.in \
--	tex-cp1252.xdy  tex-latin9.xdy
-+subdirs += finnish
- 
-+nobase_nodist_lang_DATA += \
-+	finnish/cp1252-lang.xdy finnish/cp1252-test.xdy finnish/cp1252.xdy \
-+	finnish/latin9-lang.xdy finnish/latin9-test.xdy finnish/latin9.xdy \
-+	finnish/utf8-lang.xdy finnish/utf8-test.xdy finnish/utf8.xdy
- 
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	latin9.raw \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+DOCS_CP1252 += \
-+	finnish/cp1252-doc.tex
- 
-+DOCS_LATIN9 += \
-+	finnish/latin9-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	finnish/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	finnish/utf8.pl.in
-+
-+CLEANFILES += \
-+	finnish/cp1252.pl finnish/cp1252.raw \
-+	finnish/latin9.pl finnish/latin9.raw \
-+	finnish/utf8.pl finnish/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/french/Makefile.am xindy/make-rules/alphabets/french/Makefile.am
---- xindy.orig/make-rules/alphabets/french/Makefile.am	2008-01-09 15:01:25.000000000 +0100
-+++ xindy/make-rules/alphabets/french/Makefile.am	2009-12-17 20:53:56.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for french.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1252.pl latin9.pl utf8.pl.in
-+subdirs += french
- 
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	latin9.raw \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	french/cp1252-lang.xdy french/cp1252-test.xdy french/cp1252.xdy \
-+	french/latin9-lang.xdy french/latin9-test.xdy french/latin9.xdy \
-+	french/utf8-lang.xdy french/utf8-test.xdy french/utf8.xdy
- 
-+DOCS_CP1252 += \
-+	french/cp1252-doc.tex
- 
-+DOCS_LATIN9 += \
-+	french/latin9-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	french/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	french/utf8.pl.in
-+
-+CLEANFILES += \
-+	french/cp1252.pl french/cp1252.raw \
-+	french/latin9.pl french/latin9.raw \
-+	french/utf8.pl french/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/general/Makefile.am xindy/make-rules/alphabets/general/Makefile.am
---- xindy.orig/make-rules/alphabets/general/Makefile.am	2008-01-09 15:01:25.000000000 +0100
-+++ xindy/make-rules/alphabets/general/Makefile.am	2009-12-17 20:55:12.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for general.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,20 +18,33 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	cp1252.pl cp850.pl latin9.pl template.pl utf8.pl.in \
--	latin1.xdy
--
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	cp850.raw \
--	cp850-doc.tex \
--	latin9.raw \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
-+subdirs += general
- 
-+nobase_nodist_lang_DATA += \
-+	general/cp1252-lang.xdy general/cp1252-test.xdy general/cp1252.xdy \
-+	general/cp850-lang.xdy general/cp850-test.xdy general/cp850.xdy \
-+	general/latin9-lang.xdy general/latin9-test.xdy general/latin9.xdy \
-+	general/utf8-lang.xdy general/utf8-test.xdy general/utf8.xdy
-+
-+DOCS_CP1252 += \
-+	general/cp1252-doc.tex
-+
-+DOCS_CP850 += \
-+	general/cp850-doc.tex
-+
-+DOCS_LATIN9 += \
-+	general/latin9-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	general/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	general/template.pl \
-+	general/utf8.pl.in
-+
-+CLEANFILES += \
-+	general/cp1252.pl general/cp1252.raw \
-+	general/cp850.pl general/cp850.raw \
-+	general/latin9.pl general/latin9.raw \
-+	general/utf8.pl general/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/georgian/Makefile.am xindy/make-rules/alphabets/georgian/Makefile.am
---- xindy.orig/make-rules/alphabets/georgian/Makefile.am	2008-01-09 15:01:24.000000000 +0100
-+++ xindy/make-rules/alphabets/georgian/Makefile.am	2010-01-09 00:52:50.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for georgian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,12 +18,17 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = utf8.pl.in
-+subdirs += georgian
- 
--CLEANFILES = \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	georgian/utf8-lang.xdy georgian/utf8-test.xdy georgian/utf8.xdy
- 
-+DOCS_UTF8_OTHER += \
-+	georgian/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	georgian/utf8.pl.in
- 
-+CLEANFILES += \
-+	georgian/utf8.pl georgian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/german/Makefile.am xindy/make-rules/alphabets/german/Makefile.am
---- xindy.orig/make-rules/alphabets/german/Makefile.am	2008-01-09 15:01:22.000000000 +0100
-+++ xindy/make-rules/alphabets/german/Makefile.am	2009-12-17 22:37:57.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for german.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,23 +18,35 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	braille-utf8.pl.in  duden-latin1.pl \
--	din5007-latin1.pl duden-utf8.pl.in din5007-utf8.pl.in \
--	tex-din5007-latin1.xdy tex-duden-latin1.xdy tex-latin1.xdy
--
--CLEANFILES = \
--	braille-utf8.raw \
--	braille-utf8-doc.tex \
--	din5007-latin1.raw \
--	din5007-latin1-doc.tex \
--	din5007-utf8.raw \
--	din5007-utf8-doc.tex \
--	duden-latin1.raw \
--	duden-latin1-doc.tex \
--	duden-utf8.raw \
--	duden-utf8-doc.tex
--
--
-+subdirs += german
- 
-+nobase_nodist_lang_DATA += \
-+	german/braille-utf8-lang.xdy german/braille-utf8-test.xdy german/braille-utf8.xdy \
-+	german/din5007-latin1-lang.xdy german/din5007-latin1-test.xdy german/din5007-latin1.xdy \
-+	german/din5007-utf8-lang.xdy german/din5007-utf8-test.xdy german/din5007-utf8.xdy \
-+	german/duden-latin1-lang.xdy german/duden-latin1-test.xdy german/duden-latin1.xdy \
-+	german/duden-utf8-lang.xdy german/duden-utf8-test.xdy german/duden-utf8.xdy
-+
-+DOCS_LATIN1 += \
-+	german/din5007-latin1-doc.tex \
-+	german/duden-latin1-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	german/din5007-utf8-doc.tex \
-+	german/duden-utf8-doc.tex
-+
-+DOCS_UTF8_OTHER += \
-+	german/braille-utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	german/braille-utf8.pl.in \
-+	german/duden-utf8.pl.in \
-+	german/din5007-utf8.pl.in
-+
-+CLEANFILES += \
-+	german/braille-utf8.pl german/braille-utf8.raw \
-+	german/din5007-latin1.pl german/din5007-latin1.raw \
-+	german/din5007-utf8.pl german/din5007-utf8.raw \
-+	german/duden-latin1.pl german/duden-latin1.raw \
-+	german/duden-utf8.pl german/duden-utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/greek/Makefile.am xindy/make-rules/alphabets/greek/Makefile.am
---- xindy.orig/make-rules/alphabets/greek/Makefile.am	2008-01-09 15:01:22.000000000 +0100
-+++ xindy/make-rules/alphabets/greek/Makefile.am	2010-01-10 23:27:26.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for greek.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,24 +18,38 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	iso88597.pl  polytonic-utf8.pl.in utf8.pl.in \
--	translit-latin4.pl translit-utf8.pl.in \
--	translit-tex.xdy
--
--
--CLEANFILES = \
--	iso88597.raw \
--	iso88597-doc.tex \
--	polytonic-utf8.raw \
--	polytonic-utf8-doc.tex \
--	translit-latin4.raw \
--	translit-latin4-doc.tex \
--	translit-utf8.raw \
--	translit-utf8-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
-+subdirs += greek
- 
-+nobase_nodist_lang_DATA += \
-+	greek/iso88597-lang.xdy greek/iso88597-test.xdy greek/iso88597.xdy \
-+	greek/polytonic-utf8-lang.xdy greek/polytonic-utf8-test.xdy greek/polytonic-utf8.xdy \
-+	greek/translit-latin4-lang.xdy greek/translit-latin4-test.xdy greek/translit-latin4.xdy \
-+	greek/translit-utf8-lang.xdy greek/translit-utf8-test.xdy greek/translit-utf8.xdy \
-+	greek/utf8-lang.xdy greek/utf8-test.xdy greek/utf8.xdy
-+
-+DOCS_LATIN4 += \
-+	greek/translit-latin4-doc.tex
-+
-+DOCS_ISO88597 += \
-+	greek/iso88597-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	greek/translit-utf8-doc.tex \
-+	greek/utf8-doc.tex
-+
-+DOCS_UTF8_OTHER += \
-+	greek/utf8-doc.tex \
-+	greek/polytonic-utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	greek/polytonic-utf8.pl.in \
-+	greek/translit-utf8.pl.in \
-+	greek/utf8.pl.in
-+
-+CLEANFILES += \
-+	greek/iso88597.pl greek/iso88597.raw \
-+	greek/polytonic-utf8.pl greek/polytonic-utf8.raw \
-+	greek/translit-latin4.pl greek/translit-latin4.raw \
-+	greek/translit-utf8.pl greek/translit-utf8.raw \
-+	greek/utf8.pl greek/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/gypsy/Makefile.am xindy/make-rules/alphabets/gypsy/Makefile.am
---- xindy.orig/make-rules/alphabets/gypsy/Makefile.am	2008-01-09 15:01:21.000000000 +0100
-+++ xindy/make-rules/alphabets/gypsy/Makefile.am	2009-12-17 21:03:13.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for gypsy.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,11 +18,17 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = northrussian-utf8.pl.in
-+subdirs += gypsy
- 
--CLEANFILES = \
--	northrussian-utf8.raw \
--	northrussian-utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	gypsy/northrussian-utf8-lang.xdy gypsy/northrussian-utf8-test.xdy gypsy/northrussian-utf8.xdy
- 
-+DOCS_UTF8_LAT += \
-+	gypsy/northrussian-utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	gypsy/northrussian-utf8.pl.in
-+
-+CLEANFILES += \
-+	gypsy/northrussian-utf8.pl gypsy/northrussian-utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hausa/Makefile.am xindy/make-rules/alphabets/hausa/Makefile.am
---- xindy.orig/make-rules/alphabets/hausa/Makefile.am	2008-01-09 15:01:21.000000000 +0100
-+++ xindy/make-rules/alphabets/hausa/Makefile.am	2009-12-17 21:03:24.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for hausa.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,12 +18,17 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = utf8.pl.in
-+subdirs += hausa
- 
--CLEANFILES = \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	hausa/utf8-lang.xdy hausa/utf8-test.xdy hausa/utf8.xdy
- 
-+DOCS_UTF8_LAT += \
-+	hausa/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	hausa/utf8.pl.in
- 
-+CLEANFILES += \
-+	hausa/utf8.pl hausa/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hebrew/Makefile.am xindy/make-rules/alphabets/hebrew/Makefile.am
---- xindy.orig/make-rules/alphabets/hebrew/Makefile.am	2008-01-09 15:01:21.000000000 +0100
-+++ xindy/make-rules/alphabets/hebrew/Makefile.am	2010-01-09 01:00:32.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for hebrew.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = iso88598.pl utf8.pl.in
-+subdirs += hebrew
- 
--CLEANFILES = \
--	iso88598.raw \
--	iso88598-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	hebrew/iso88598-lang.xdy hebrew/iso88598-test.xdy hebrew/iso88598.xdy \
-+	hebrew/utf8-lang.xdy hebrew/utf8-test.xdy hebrew/utf8.xdy
- 
-+DOCS_ISO88598 += \
-+	hebrew/iso88598-doc.tex
- 
-+DOCS_UTF8_OTHER += \
-+	hebrew/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	hebrew/utf8.pl.in
-+
-+CLEANFILES += \
-+	hebrew/iso88598.pl hebrew/iso88598.raw \
-+	hebrew/utf8.pl hebrew/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hungarian/Makefile.am xindy/make-rules/alphabets/hungarian/Makefile.am
---- xindy.orig/make-rules/alphabets/hungarian/Makefile.am	2008-01-09 15:01:20.000000000 +0100
-+++ xindy/make-rules/alphabets/hungarian/Makefile.am	2009-12-17 21:05:21.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for hungarian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
-+subdirs += hungarian
- 
--CLEANFILES = \
--	cp1250.raw \
--	cp1250-doc.tex \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	hungarian/cp1250-lang.xdy hungarian/cp1250-test.xdy hungarian/cp1250.xdy \
-+	hungarian/latin2-lang.xdy hungarian/latin2-test.xdy hungarian/latin2.xdy \
-+	hungarian/utf8-lang.xdy hungarian/utf8-test.xdy hungarian/utf8.xdy
- 
-+DOCS_CP1250 += \
-+	hungarian/cp1250-doc.tex
- 
-+DOCS_LATIN2 += \
-+	hungarian/latin2-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	hungarian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	hungarian/utf8.pl.in
-+
-+CLEANFILES += \
-+	hungarian/cp1250.pl hungarian/cp1250.raw \
-+	hungarian/latin2.pl hungarian/latin2.raw \
-+	hungarian/utf8.pl hungarian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/icelandic/Makefile.am xindy/make-rules/alphabets/icelandic/Makefile.am
---- xindy.orig/make-rules/alphabets/icelandic/Makefile.am	2008-01-09 15:01:20.000000000 +0100
-+++ xindy/make-rules/alphabets/icelandic/Makefile.am	2009-12-17 21:05:55.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for icelandic.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,19 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	cp1252.pl latin9.pl utf8.pl.in \
--	latin1.xdy
-+subdirs += icelandic
- 
-+nobase_nodist_lang_DATA += \
-+	icelandic/cp1252-lang.xdy icelandic/cp1252-test.xdy icelandic/cp1252.xdy \
-+	icelandic/latin9-lang.xdy icelandic/latin9-test.xdy icelandic/latin9.xdy \
-+	icelandic/utf8-lang.xdy icelandic/utf8-test.xdy icelandic/utf8.xdy
- 
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	latin9.raw \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+DOCS_CP1252 += \
-+	icelandic/cp1252-doc.tex
- 
-+DOCS_LATIN9 += \
-+	icelandic/latin9-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	icelandic/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	icelandic/utf8.pl.in
-+
-+CLEANFILES += \
-+	icelandic/cp1252.pl icelandic/cp1252.raw \
-+	icelandic/latin9.pl icelandic/latin9.raw \
-+	icelandic/utf8.pl icelandic/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/italian/Makefile.am xindy/make-rules/alphabets/italian/Makefile.am
---- xindy.orig/make-rules/alphabets/italian/Makefile.am	2008-01-09 15:01:19.000000000 +0100
-+++ xindy/make-rules/alphabets/italian/Makefile.am	2009-12-17 21:06:18.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for italian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin1.pl utf8.pl.in
-+subdirs += italian
- 
--CLEANFILES = \
--	latin1.raw \
--	latin1-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	italian/latin1-lang.xdy italian/latin1-test.xdy italian/latin1.xdy \
-+	italian/utf8-lang.xdy italian/utf8-test.xdy italian/utf8.xdy
- 
-+DOCS_LATIN1 += \
-+	italian/latin1-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	italian/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	italian/utf8.pl.in
-+
-+CLEANFILES += \
-+	italian/latin1.pl italian/latin1.raw \
-+	italian/utf8.pl italian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/klingon/Makefile.am xindy/make-rules/alphabets/klingon/Makefile.am
---- xindy.orig/make-rules/alphabets/klingon/Makefile.am	2008-01-09 15:01:19.000000000 +0100
-+++ xindy/make-rules/alphabets/klingon/Makefile.am	2010-01-10 23:28:48.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for klingon.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,15 +18,20 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	utf8.pl.in \
--	translit-ascii.pl
-+subdirs += klingon
- 
-+nobase_nodist_lang_DATA += \
-+	klingon/utf8-lang.xdy klingon/utf8-test.xdy klingon/utf8.xdy
- 
--CLEANFILES = \
--	utf8.raw \
--	utf8-doc.tex
-+DOCS_UTF8_OTHER += \
-+	klingon/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	klingon/utf8.pl.in
- 
-+EXTRA_DIST += \
-+	klingon/translit-ascii.pl
- 
-+CLEANFILES += \
-+	klingon/utf8.pl klingon/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/kurdish/Makefile.am xindy/make-rules/alphabets/kurdish/Makefile.am
---- xindy.orig/make-rules/alphabets/kurdish/Makefile.am	2008-01-09 15:01:18.000000000 +0100
-+++ xindy/make-rules/alphabets/kurdish/Makefile.am	2009-12-17 21:07:54.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for kurdish.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,20 +18,29 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--	bedirxan-latin5.pl bedirxan-utf8.pl.in \
--	turkish-i-latin5.pl turkish-i-utf8.pl.in \
--	latin5.xdy
--
--CLEANFILES = \
--	bedirxan-latin5.raw \
--	bedirxan-latin5-doc.tex \
--	bedirxan-utf8.raw \
--	bedirxan-utf8-doc.tex \
--	turkish-i-latin5.raw \
--	turkish-i-latin5-doc.tex \
--	turkish-i-utf8.raw \
--	turkish-i-utf8-doc.tex
--
-+subdirs += kurdish
- 
-+nobase_nodist_lang_DATA += \
-+	kurdish/bedirxan-latin5-lang.xdy kurdish/bedirxan-latin5-test.xdy kurdish/bedirxan-latin5.xdy \
-+	kurdish/bedirxan-utf8-lang.xdy kurdish/bedirxan-utf8-test.xdy kurdish/bedirxan-utf8.xdy \
-+	kurdish/turkish-i-latin5-lang.xdy kurdish/turkish-i-latin5-test.xdy kurdish/turkish-i-latin5.xdy \
-+	kurdish/turkish-i-utf8-lang.xdy kurdish/turkish-i-utf8-test.xdy kurdish/turkish-i-utf8.xdy
-+
-+DOCS_LATIN5 += \
-+	kurdish/bedirxan-latin5-doc.tex \
-+	kurdish/turkish-i-latin5-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	kurdish/bedirxan-utf8-doc.tex \
-+	kurdish/turkish-i-utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	kurdish/bedirxan-utf8.pl.in \
-+	kurdish/turkish-i-utf8.pl.in
-+
-+CLEANFILES += \
-+	kurdish/bedirxan-latin5.pl kurdish/bedirxan-latin5.raw \
-+	kurdish/bedirxan-utf8.pl kurdish/bedirxan-utf8.raw \
-+	kurdish/turkish-i-latin5.pl kurdish/turkish-i-latin5.raw \
-+	kurdish/turkish-i-utf8.pl kurdish/turkish-i-utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/latin/Makefile.am xindy/make-rules/alphabets/latin/Makefile.am
---- xindy.orig/make-rules/alphabets/latin/Makefile.am	2008-01-09 15:01:18.000000000 +0100
-+++ xindy/make-rules/alphabets/latin/Makefile.am	2009-12-17 21:08:11.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for latin.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,12 +18,17 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = utf8.pl.in
-+subdirs += latin
- 
--CLEANFILES = \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	latin/utf8-lang.xdy latin/utf8-test.xdy latin/utf8.xdy
- 
-+DOCS_UTF8_LAT += \
-+	latin/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	latin/utf8.pl.in
- 
-+CLEANFILES += \
-+	latin/utf8.pl latin/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/latvian/Makefile.am xindy/make-rules/alphabets/latvian/Makefile.am
---- xindy.orig/make-rules/alphabets/latvian/Makefile.am	2008-01-09 15:01:17.000000000 +0100
-+++ xindy/make-rules/alphabets/latvian/Makefile.am	2009-12-17 21:08:35.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for latvian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin4.pl utf8.pl.in
-+subdirs += latvian
- 
--CLEANFILES = \
--	latin4.raw \
--	latin4-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	latvian/latin4-lang.xdy latvian/latin4-test.xdy latvian/latin4.xdy \
-+	latvian/utf8-lang.xdy latvian/utf8-test.xdy latvian/utf8.xdy
- 
-+DOCS_LATIN4 += \
-+	latvian/latin4-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	latvian/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	latvian/utf8.pl.in
-+
-+CLEANFILES += \
-+	latvian/latin4.pl latvian/latin4.raw \
-+	latvian/utf8.pl latvian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lithuanian/Makefile.am xindy/make-rules/alphabets/lithuanian/Makefile.am
---- xindy.orig/make-rules/alphabets/lithuanian/Makefile.am	2008-01-09 15:01:17.000000000 +0100
-+++ xindy/make-rules/alphabets/lithuanian/Makefile.am	2009-12-17 21:09:06.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for lithuanian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin4.pl utf8.pl.in
-+subdirs += lithuanian
- 
--CLEANFILES = \
--	latin4.raw \
--	latin4-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	lithuanian/latin4-lang.xdy lithuanian/latin4-test.xdy lithuanian/latin4.xdy \
-+	lithuanian/utf8-lang.xdy lithuanian/utf8-test.xdy lithuanian/utf8.xdy
- 
-+DOCS_LATIN4 += \
-+	lithuanian/latin4-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	lithuanian/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	lithuanian/utf8.pl.in
-+
-+CLEANFILES += \
-+	lithuanian/latin4.pl lithuanian/latin4.raw \
-+	lithuanian/utf8.pl lithuanian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lower-sorbian/Makefile.am xindy/make-rules/alphabets/lower-sorbian/Makefile.am
---- xindy.orig/make-rules/alphabets/lower-sorbian/Makefile.am	2008-01-09 15:01:16.000000000 +0100
-+++ xindy/make-rules/alphabets/lower-sorbian/Makefile.am	2010-01-09 00:52:52.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for lower-sorbian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
-+subdirs += lower-sorbian
- 
--CLEANFILES = \
--	cp1250.raw \
--	cp1250-doc.tex \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	lower-sorbian/cp1250-lang.xdy lower-sorbian/cp1250-test.xdy lower-sorbian/cp1250.xdy \
-+	lower-sorbian/latin2-lang.xdy lower-sorbian/latin2-test.xdy lower-sorbian/latin2.xdy \
-+	lower-sorbian/utf8-lang.xdy lower-sorbian/utf8-test.xdy lower-sorbian/utf8.xdy
- 
-+DOCS_CP1250 += \
-+	lower-sorbian/cp1250-doc.tex
- 
-+DOCS_LATIN2 += \
-+	lower-sorbian/latin2-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	lower-sorbian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	lower-sorbian/utf8.pl.in
-+
-+CLEANFILES += \
-+	lower-sorbian/cp1250.pl lower-sorbian/cp1250.raw \
-+	lower-sorbian/latin2.pl lower-sorbian/latin2.raw \
-+	lower-sorbian/utf8.pl lower-sorbian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/macedonian/Makefile.am xindy/make-rules/alphabets/macedonian/Makefile.am
---- xindy.orig/make-rules/alphabets/macedonian/Makefile.am	2008-01-09 15:01:16.000000000 +0100
-+++ xindy/make-rules/alphabets/macedonian/Makefile.am	2009-12-17 21:10:51.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for macedonian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,18 +18,32 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1251.pl iso88595.pl isoir111.pl utf8.pl.in
--
--CLEANFILES = \
--	cp1251.raw \
--	cp1251-doc.tex \
--	iso88595.raw \
--	iso88595-doc.tex \
--	isoir111.raw \
--	isoir111-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
-+subdirs += macedonian
- 
-+nobase_nodist_lang_DATA += \
-+	macedonian/cp1251-lang.xdy macedonian/cp1251-test.xdy macedonian/cp1251.xdy \
-+	macedonian/iso88595-lang.xdy macedonian/iso88595-test.xdy macedonian/iso88595.xdy \
-+	macedonian/isoir111-lang.xdy macedonian/isoir111-test.xdy macedonian/isoir111.xdy \
-+	macedonian/utf8-lang.xdy macedonian/utf8-test.xdy macedonian/utf8.xdy
-+
-+DOCS_CYR_1251 += \
-+	macedonian/cp1251-doc.tex
-+
-+DOCS_CYR_ISO88595 += \
-+	macedonian/iso88595-doc.tex
-+
-+DOCS_CYR_ISOIR111 += \
-+	macedonian/isoir111-doc.tex
-+
-+DOCS_UTF8_CYR += \
-+	macedonian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	macedonian/utf8.pl.in
-+
-+CLEANFILES += \
-+	macedonian/cp1251.pl macedonian/cp1251.raw \
-+	macedonian/iso88595.pl macedonian/iso88595.raw \
-+	macedonian/isoir111.pl macedonian/isoir111.raw \
-+	macedonian/utf8.pl macedonian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/mongolian/Makefile.am xindy/make-rules/alphabets/mongolian/Makefile.am
---- xindy.orig/make-rules/alphabets/mongolian/Makefile.am	2008-01-09 15:01:15.000000000 +0100
-+++ xindy/make-rules/alphabets/mongolian/Makefile.am	2009-12-17 21:11:05.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for mongolian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,12 +18,17 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cyrillic-utf8.pl.in
-+subdirs += mongolian
- 
--CLEANFILES = \
--	cyrillic-utf8.raw \
--	cyrillic-utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	mongolian/cyrillic-utf8-lang.xdy mongolian/cyrillic-utf8-test.xdy mongolian/cyrillic-utf8.xdy
- 
-+DOCS_UTF8_CYR += \
-+	mongolian/cyrillic-utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	mongolian/cyrillic-utf8.pl.in
- 
-+CLEANFILES += \
-+	mongolian/cyrillic-utf8.pl mongolian/cyrillic-utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/norwegian/Makefile.am xindy/make-rules/alphabets/norwegian/Makefile.am
---- xindy.orig/make-rules/alphabets/norwegian/Makefile.am	2008-01-09 15:01:15.000000000 +0100
-+++ xindy/make-rules/alphabets/norwegian/Makefile.am	2009-12-17 21:11:29.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for norwegian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin1.pl utf8.pl.in
-+subdirs += norwegian
- 
--CLEANFILES = \
--	latin1.raw \
--	latin1-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	norwegian/latin1-lang.xdy norwegian/latin1-test.xdy norwegian/latin1.xdy \
-+	norwegian/utf8-lang.xdy norwegian/utf8-test.xdy norwegian/utf8.xdy
- 
-+DOCS_LATIN1 += \
-+	norwegian/latin1-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	norwegian/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	norwegian/utf8.pl.in
-+
-+CLEANFILES += \
-+	norwegian/latin1.pl norwegian/latin1.raw \
-+	norwegian/utf8.pl norwegian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/polish/Makefile.am xindy/make-rules/alphabets/polish/Makefile.am
---- xindy.orig/make-rules/alphabets/polish/Makefile.am	2008-01-09 15:01:14.000000000 +0100
-+++ xindy/make-rules/alphabets/polish/Makefile.am	2009-12-17 21:12:03.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for polish.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
-+subdirs += polish
- 
--CLEANFILES = \
--	cp1250.raw \
--	cp1250-doc.tex \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	polish/cp1250-lang.xdy polish/cp1250-test.xdy polish/cp1250.xdy \
-+	polish/latin2-lang.xdy polish/latin2-test.xdy polish/latin2.xdy \
-+	polish/utf8-lang.xdy polish/utf8-test.xdy polish/utf8.xdy
- 
-+DOCS_CP1250 += \
-+	polish/cp1250-doc.tex
- 
-+DOCS_LATIN2 += \
-+	polish/latin2-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	polish/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	polish/utf8.pl.in
-+
-+CLEANFILES += \
-+	polish/cp1250.pl polish/cp1250.raw \
-+	polish/latin2.pl polish/latin2.raw \
-+	polish/utf8.pl polish/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/portuguese/Makefile.am xindy/make-rules/alphabets/portuguese/Makefile.am
---- xindy.orig/make-rules/alphabets/portuguese/Makefile.am	2008-01-09 15:01:14.000000000 +0100
-+++ xindy/make-rules/alphabets/portuguese/Makefile.am	2009-12-17 21:12:27.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for portuguese.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,22 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin1.pl utf8.pl.in
-+subdirs += portuguese
- 
--CLEANFILES = \
--	latin1.raw \
--	latin1-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	portuguese/latin1-lang.xdy portuguese/latin1-test.xdy portuguese/latin1.xdy \
-+	portuguese/utf8-lang.xdy portuguese/utf8-test.xdy portuguese/utf8.xdy
- 
-+DOCS_LATIN1 += \
-+	portuguese/latin1-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	portuguese/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	portuguese/utf8.pl.in
-+
-+CLEANFILES += \
-+	portuguese/latin1.pl portuguese/latin1.raw \
-+	portuguese/utf8.pl portuguese/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/romanian/Makefile.am xindy/make-rules/alphabets/romanian/Makefile.am
---- xindy.orig/make-rules/alphabets/romanian/Makefile.am	2008-01-09 15:01:14.000000000 +0100
-+++ xindy/make-rules/alphabets/romanian/Makefile.am	2009-12-17 21:16:41.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for romanian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,14 +18,32 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin2.pl utf8.pl.in
--
--CLEANFILES = \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
-+subdirs += romanian
- 
-+nobase_nodist_lang_DATA += \
-+	romanian/latin2-lang.xdy romanian/latin2-test.xdy romanian/latin2.xdy \
-+	romanian/utf8-lang.xdy romanian/utf8-test.xdy romanian/utf8.xdy
-+
-+DOCS_LATIN2 += \
-+	romanian/latin2-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	romanian/utf8-doc.tex
-+
-+romanian/cp1250.pl : romanian/utf8.pl
-+	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-+	$(CONVERT_FROM_UTF8)CP1250 >$@
-+
-+romanian/latin2.pl : romanian/utf8.pl
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lang.defs xindy/make-rules/alphabets/lang.defs
+--- xindy.orig/make-rules/alphabets/lang.defs	2010-01-13 14:37:26.000000000 +0100
++++ xindy/make-rules/alphabets/lang.defs	2010-01-10 22:08:23.000000000 +0100
+@@ -0,0 +1,45 @@
++albanian UTF8_LAT LATIN1
++belarusian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
++bulgarian UTF8_CYR CYR_ISO88595 CYR_KOI8_R CYR_1251
++croatian UTF8_LAT CP1250 LATIN2
++czech UTF8_LAT CP1250 LATIN2
++danish UTF8_LAT CP1252 LATIN9
++dutch ij-as-ij UTF8_LAT LATIN1 ij-as-y UTF8_LAT
++english UTF8_LAT CP1252 LATIN9
++esperanto UTF8_LAT LATIN3
++estonian UTF8_LAT CP1252 LATIN9
++finnish UTF8_LAT CP1252 LATIN9
++french UTF8_LAT CP1252 LATIN9
++general UTF8_LAT CP1252 CP850 LATIN9
++georgian UTF8_OTHER
++german braille UTF8_OTHER din5007 UTF8_LAT LATIN1 duden UTF8_LAT LATIN1
++greek UTF8_OTHER ISO88597 polytonic UTF8_OTHER translit UTF8_LAT LATIN4
++gypsy northrussian UTF8_LAT 
++hausa UTF8_LAT
++hebrew UTF8_OTHER ISO88598
++hungarian UTF8_LAT CP1250 LATIN2
++icelandic UTF8_LAT CP1252 LATIN9
++italian UTF8_LAT LATIN1
++klingon UTF8_OTHER
++kurdish bedirxan UTF8_LAT LATIN5 turkish-i UTF8_LAT LATIN5
++latin UTF8_LAT
++latvian UTF8_LAT LATIN4
++lithuanian UTF8_LAT LATIN4
++lower-sorbian UTF8_LAT CP1250 LATIN2
++macedonian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
++mongolian cyrillic UTF8_CYR cyrillic
++norwegian UTF8_LAT LATIN1
++polish UTF8_LAT CP1250 LATIN2
++portuguese UTF8_LAT LATIN1
++romanian UTF8_LAT LATIN2
++russian UTF8_CYR CYR_ISO88595 CYR_KOI8_R CYR_1251 translit-iso UTF8_LAT
++serbian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
++slovak large UTF8_LAT CP1250 LATIN2 small UTF8_LAT CP1250 LATIN2
++slovenian UTF8_LAT CP1250 LATIN2
++spanish modern UTF8_LAT LATIN1 traditional UTF8_LAT LATIN1
++swedish UTF8_LAT CP1252 LATIN9
++test1
++turkish UTF8_LAT LATIN3 LATIN5
++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.orig/make-rules/alphabets/mk-lang.sh xindy/make-rules/alphabets/mk-lang.sh
+--- xindy.orig/make-rules/alphabets/mk-lang.sh	2010-01-13 14:37:26.000000000 +0100
++++ xindy/make-rules/alphabets/mk-lang.sh	2010-01-13 13:51:57.000000000 +0100
+@@ -0,0 +1,213 @@
++#! /bin/sh
++
++# Copyright (C) 2010 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.
++
++# Generate the Makefile fragments lang/Makefile.am from language
++# definitions in lang.defs containing lines:
++#   lang [[prefix] UTF8_DOC [DOC]...]...
++# where
++#   prefix is an optional filename prefix, without final '-'
++#   UTF8_DOC is a DOCS_UTF8_* variable, without leading 'DOCS_'
++#   DOC is an other DOCS_* variable, without leading 'DOCS_'
++
++CP_DOCS='CP1250 CP1252 CP850'
++LATIN_DOCS='LATIN1 LATIN2 LATIN3 LATIN4 LATIN5 LATIN9'
++CYR_DOCS='CYR_1251 CYR_ISO88595 CYR_ISOIR111 CYR_KOI8_R CYR_KOI8_U'
++ISO_DOCS='ISO88597 ISO88598'
++UTF_DOCS='UTF8_LAT UTF8_CYR UTF8_OTHER'
++
++ALL_DOCS="$CP_DOCS $LATIN_DOCS $CYR_DOCS $ISO_DOCS $UTF_DOCS"
++
++err_exit () {
++	echo "bad argument \"$arg\""
++	exit 1
++}
++
++do_XDY () {
++	XDY="$XDY $name"
++	eval DOCS_$arg="\"\$DOCS_$arg $name\""
++}
++
++do_UTF8 () {
++	PLIN="$PLIN $name"
++	do_XDY
++}
++
++do_CODE () {
++	PL="$PL $name"
++	do_XDY
++}
++
++parse_lang () {
++	for DOC in $ALL_DOCS; do
++		eval DOCS_$DOC=
++	done
++	PLIN= PL= XDY=	
++	lang=$1
++	shift
++	pref=
++	for arg
++	do
++		case $arg in
++			[a-z]*) pref="$arg-";;
++			UTF8_*) name=${pref}utf8; do_UTF8;;
++			[A-Z]*)	case $arg in
++					CP*) val="cp${arg:2}";;
++					ISO*) val="iso${arg:3}";;
++					LATIN*) val="latin${arg:5}";;
++					CYR_1251) val=cp1251;;
++					CYR_ISO88595) val=iso88595;;
++					CYR_ISOIR111) val=isoir111;;
++					CYR_KOI8_R) val=koi8-r;;
++					CYR_KOI8_U) val=koi8-u;;
++					*) err_exit;;
++				esac
++				name="$pref$val"
++				do_CODE
++			;;
++			*) err_exit;;
++		esac
++	done
++}
++
++print_header () {
++	cat <<-_EOF
++	## Makefile fragment for $lang.
++
++	## Copyright (C) 2009, 2010 by Peter Breitenlohner.
++	## 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.
++
++	subdirs += $lang
++	_EOF
++}
++
++print_xdy () {
++	test $# -eq 0 && return
++	printf '\nnobase_nodist_lang_DATA +='
++	for xdy
++	do
++		printf ' \\\n\t'$lang'/%s-lang.xdy' $xdy
++		printf ' \\\n\t'$lang'/%s-test.xdy' $xdy
++		printf ' \\\n\t'$lang'/%s.xdy' $xdy
++	done
++	printf "\n"
++}
++
++print_docs () {
++	test $# -eq 0 && return
++	printf '\nDOCS_%s +=' $DOC
++	printf ' \\\n\t'$lang'/%s-doc.tex' "$@"
++	printf "\n"
++}
++
++print_extra_hdr () {
++	test -n "$print_extra_hdr_done" && return
++	printf '\nEXTRA_DIST +='
++	print_extra_hdr_done=yes
++}
++
++print_extra () {
++	test $# -eq 0 && return
++	print_extra_hdr
++	printf ' \\\n\t%s' "$@"
++}
++
++print_extra_plin () {
++	test $# -eq 0 && return
++	print_extra_hdr
++	printf ' \\\n\t'$lang'/%s.pl.in' "$@"
++}
++
++print_pl () {
++	test $# -eq 0 && return
++	printf '\ndist_noinst_DATA +='
++	printf ' \\\n\t'$lang'/%s.pl' "$@"
++	printf "\n"
++}
++
++print_clean () {
++	test $# -eq 0 && return
++	printf '\nCLEANFILES +='
++	for clean
++	do
++		case $clean in
++			*utf8) printf ' \\\n\t'$lang'/%s.pl' $clean;;
++		esac
++		printf ' \\\n\t'$lang'/%s.raw' $clean
++	done
++	printf "\n"
++}
++
++make_lang () {
++	print_header
++	print_xdy $XDY
++	for DOC in $ALL_DOCS; do
++		eval print_docs \$DOCS_$DOC
++	done
++	print_extra_hdr_done=
++	case $lang in
++		general) PL="$PL template";;
++		klingon) PL="$PL translit-ascii";;
++		test1) PL="$PL test1";;
++		romanian)
++			cat <<\_EOF
++
++romanian/latin2.pl : romanian/utf8.pl.in
 +	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
 +	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
-+
-+EXTRA_DIST += \
-+	rom-comma-kludge.sed \
-+	romanian/utf8.pl.in
-+
-+CLEANFILES += \
-+	romanian/cp1250.raw romanian/cp1250.pl \
-+	romanian/latin2.pl romanian/latin2.raw \
-+	romanian/utf8.pl romanian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/russian/Makefile.am xindy/make-rules/alphabets/russian/Makefile.am
---- xindy.orig/make-rules/alphabets/russian/Makefile.am	2008-01-09 15:01:13.000000000 +0100
-+++ xindy/make-rules/alphabets/russian/Makefile.am	2009-12-17 21:18:03.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for russian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,22 +18,38 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--    cp1251.pl iso88595.pl koi8-r.pl translit-iso-utf8.pl.in utf8.pl.in \
--    translit-iso-tex.xdy translit-tex.xdy translit-tgl-tex.xdy
--
--CLEANFILES = \
--	cp1251.raw \
--	cp1251-doc.tex \
--	iso88595.raw \
--	iso88595-doc.tex \
--	koi8-r.raw \
--	koi8-r-doc.tex \
--	translit-iso-utf8.raw \
--	translit-iso-utf8-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
-+subdirs += russian
- 
-+nobase_nodist_lang_DATA += \
-+	russian/cp1251-lang.xdy russian/cp1251-test.xdy russian/cp1251.xdy \
-+	russian/iso88595-lang.xdy russian/iso88595-test.xdy russian/iso88595.xdy \
-+	russian/koi8-r-lang.xdy russian/koi8-r-test.xdy russian/koi8-r.xdy \
-+	russian/translit-iso-utf8-lang.xdy russian/translit-iso-utf8-test.xdy russian/translit-iso-utf8.xdy \
-+	russian/utf8-lang.xdy russian/utf8-test.xdy russian/utf8.xdy
-+
-+DOCS_CYR_1251 += \
-+	russian/cp1251-doc.tex
-+
-+DOCS_CYR_ISO88595 += \
-+	russian/iso88595-doc.tex
-+
-+DOCS_CYR_KOI8_R += \
-+	russian/koi8-r-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	russian/translit-iso-utf8-doc.tex
-+
-+DOCS_UTF8_CYR += \
-+	russian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	russian/translit-iso-utf8.pl.in \
-+	russian/utf8.pl.in
-+
-+CLEANFILES += \
-+	russian/cp1251.pl russian/cp1251.raw \
-+	russian/iso88595.pl russian/iso88595.raw \
-+	russian/koi8-r.pl russian/koi8-r.raw \
-+	russian/translit-iso-utf8.pl russian/translit-iso-utf8.raw \
-+	russian/utf8.pl russian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/serbian/Makefile.am xindy/make-rules/alphabets/serbian/Makefile.am
---- xindy.orig/make-rules/alphabets/serbian/Makefile.am	2008-01-09 15:01:13.000000000 +0100
-+++ xindy/make-rules/alphabets/serbian/Makefile.am	2009-12-17 21:18:57.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for serbian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,18 +18,32 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1251.pl iso88595.pl isoir111.pl utf8.pl.in
--
--CLEANFILES = \
--	cp1251.raw \
--	cp1251-doc.tex \
--	iso88595.raw \
--	iso88595-doc.tex \
--	isoir111.raw \
--	isoir111-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
--
--
-+subdirs += serbian
- 
-+nobase_nodist_lang_DATA += \
-+	serbian/cp1251-lang.xdy serbian/cp1251-test.xdy serbian/cp1251.xdy \
-+	serbian/iso88595-lang.xdy serbian/iso88595-test.xdy serbian/iso88595.xdy \
-+	serbian/isoir111-lang.xdy serbian/isoir111-test.xdy serbian/isoir111.xdy \
-+	serbian/utf8-lang.xdy serbian/utf8-test.xdy serbian/utf8.xdy
-+
-+DOCS_CYR_1251 += \
-+	serbian/cp1251-doc.tex
-+
-+DOCS_CYR_ISO88595 += \
-+	serbian/iso88595-doc.tex
-+
-+DOCS_CYR_ISOIR111 += \
-+	serbian/isoir111-doc.tex
-+
-+DOCS_UTF8_CYR += \
-+	serbian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	serbian/utf8.pl.in
-+
-+CLEANFILES += \
-+	serbian/cp1251.pl serbian/cp1251.raw \
-+	serbian/iso88595.pl serbian/iso88595.raw \
-+	serbian/isoir111.pl serbian/isoir111.raw \
-+	serbian/utf8.pl serbian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/slovak/Makefile.am xindy/make-rules/alphabets/slovak/Makefile.am
---- xindy.orig/make-rules/alphabets/slovak/Makefile.am	2008-01-09 15:01:12.000000000 +0100
-+++ xindy/make-rules/alphabets/slovak/Makefile.am	2009-12-17 21:20:23.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for slovak.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,24 +18,37 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--    large-cp1250.pl large-latin2.pl large-utf8.pl.in \
--    small-cp1250.pl small-latin2.pl small-utf8.pl.in
--
--CLEANFILES = \
--	large-cp1250.raw \
--	large-cp1250-doc.tex \
--	large-latin2.raw \
--	large-latin2-doc.tex \
--	large-utf8.raw \
--	large-utf8-doc.tex \
--	small-cp1250.raw \
--	small-cp1250-doc.tex \
--	small-latin2.raw \
--	small-latin2-doc.tex \
--	small-utf8.raw \
--	small-utf8-doc.tex
--
--
-+subdirs += slovak
- 
-+nobase_nodist_lang_DATA += \
-+	slovak/large-cp1250-lang.xdy slovak/large-cp1250-test.xdy slovak/large-cp1250.xdy \
-+	slovak/large-latin2-lang.xdy slovak/large-latin2-test.xdy slovak/large-latin2.xdy \
-+	slovak/large-utf8-lang.xdy slovak/large-utf8-test.xdy slovak/large-utf8.xdy \
-+	slovak/small-cp1250-lang.xdy slovak/small-cp1250-test.xdy slovak/small-cp1250.xdy \
-+	slovak/small-latin2-lang.xdy slovak/small-latin2-test.xdy slovak/small-latin2.xdy \
-+	slovak/small-utf8-lang.xdy slovak/small-utf8-test.xdy slovak/small-utf8.xdy
-+
-+DOCS_CP1250 += \
-+	slovak/large-cp1250-doc.tex \
-+	slovak/small-cp1250-doc.tex
-+
-+DOCS_LATIN2 += \
-+	slovak/small-latin2-doc.tex \
-+	slovak/large-latin2-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	slovak/small-utf8-doc.tex \
-+	slovak/large-utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	slovak/large-utf8.pl.in \
-+	slovak/small-utf8.pl.in
-+
-+CLEANFILES += \
-+	slovak/large-cp1250.pl slovak/large-cp1250.raw \
-+	slovak/large-latin2.pl slovak/large-latin2.raw \
-+	slovak/large-utf8.pl slovak/large-utf8.raw \
-+	slovak/small-cp1250.pl slovak/small-cp1250.raw \
-+	slovak/small-latin2.pl slovak/small-latin2.raw \
-+	slovak/small-utf8.pl slovak/small-utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/slovenian/Makefile.am xindy/make-rules/alphabets/slovenian/Makefile.am
---- xindy.orig/make-rules/alphabets/slovenian/Makefile.am	2008-01-09 15:01:12.000000000 +0100
-+++ xindy/make-rules/alphabets/slovenian/Makefile.am	2009-12-17 21:20:57.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for slovenian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
-+subdirs += slovenian
- 
--CLEANFILES = \
--	cp1250.raw \
--	cp1250-doc.tex \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	slovenian/cp1250-lang.xdy slovenian/cp1250-test.xdy slovenian/cp1250.xdy \
-+	slovenian/latin2-lang.xdy slovenian/latin2-test.xdy slovenian/latin2.xdy \
-+	slovenian/utf8-lang.xdy slovenian/utf8-test.xdy slovenian/utf8.xdy
- 
-+DOCS_CP1250 += \
-+	slovenian/cp1250-doc.tex
- 
-+DOCS_LATIN2 += \
-+	slovenian/latin2-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	slovenian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	slovenian/utf8.pl.in
-+
-+CLEANFILES += \
-+	slovenian/cp1250.pl slovenian/cp1250.raw \
-+	slovenian/latin2.pl slovenian/latin2.raw \
-+	slovenian/utf8.pl slovenian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/spanish/Makefile.am xindy/make-rules/alphabets/spanish/Makefile.am
---- xindy.orig/make-rules/alphabets/spanish/Makefile.am	2008-01-09 15:01:11.000000000 +0100
-+++ xindy/make-rules/alphabets/spanish/Makefile.am	2009-12-17 21:21:50.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for spanish.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,20 +18,29 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--    modern-latin1.pl modern-utf8.pl.in \
--    traditional-latin1.pl traditional-utf8.pl.in
--
--CLEANFILES = \
--	modern-latin1.raw \
--	modern-latin1-doc.tex \
--	modern-utf8.raw \
--	modern-utf8-doc.tex \
--	traditional-latin1.raw \
--	traditional-latin1-doc.tex \
--	traditional-utf8.raw \
--	traditional-utf8-doc.tex
--
--
-+subdirs += spanish
- 
-+nobase_nodist_lang_DATA += \
-+	spanish/modern-latin1-lang.xdy spanish/modern-latin1-test.xdy spanish/modern-latin1.xdy \
-+	spanish/modern-utf8-lang.xdy spanish/modern-utf8-test.xdy spanish/modern-utf8.xdy \
-+	spanish/traditional-latin1-lang.xdy spanish/traditional-latin1-test.xdy spanish/traditional-latin1.xdy \
-+	spanish/traditional-utf8-lang.xdy spanish/traditional-utf8-test.xdy spanish/traditional-utf8.xdy
-+
-+DOCS_LATIN1 += \
-+	spanish/modern-latin1-doc.tex \
-+	spanish/traditional-latin1-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	spanish/modern-utf8-doc.tex \
-+	spanish/traditional-utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	spanish/modern-utf8.pl.in \
-+	spanish/traditional-utf8.pl.in
-+
-+CLEANFILES += \
-+	spanish/modern-latin1.pl spanish/modern-latin1.raw \
-+	spanish/modern-utf8.pl spanish/modern-utf8.raw \
-+	spanish/traditional-latin1.pl spanish/traditional-latin1.raw \
-+	spanish/traditional-utf8.pl spanish/traditional-utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/swedish/Makefile.am xindy/make-rules/alphabets/swedish/Makefile.am
---- xindy.orig/make-rules/alphabets/swedish/Makefile.am	2008-01-09 15:01:11.000000000 +0100
-+++ xindy/make-rules/alphabets/swedish/Makefile.am	2009-12-17 21:22:22.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for swedish.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,18 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = \
--    cp1252.pl latin9.pl utf8.pl.in \
--    latin1.xdy
--
--CLEANFILES = \
--	cp1252.raw \
--	cp1252-doc.tex \
--	latin9.raw \
--	latin9-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+subdirs += swedish
- 
-+nobase_nodist_lang_DATA += \
-+	swedish/cp1252-lang.xdy swedish/cp1252-test.xdy swedish/cp1252.xdy \
-+	swedish/latin9-lang.xdy swedish/latin9-test.xdy swedish/latin9.xdy \
-+	swedish/utf8-lang.xdy swedish/utf8-test.xdy swedish/utf8.xdy
- 
-+DOCS_CP1252 += \
-+	swedish/cp1252-doc.tex
- 
-+DOCS_LATIN9 += \
-+	swedish/latin9-doc.tex
-+
-+DOCS_UTF8_LAT += \
-+	swedish/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	swedish/utf8.pl.in
-+
-+CLEANFILES += \
-+	swedish/cp1252.pl swedish/cp1252.raw \
-+	swedish/latin9.pl swedish/latin9.raw \
-+	swedish/utf8.pl swedish/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/test1/Makefile.am xindy/make-rules/alphabets/test1/Makefile.am
---- xindy.orig/make-rules/alphabets/test1/Makefile.am	2008-01-09 15:01:11.000000000 +0100
-+++ xindy/make-rules/alphabets/test1/Makefile.am	2009-12-04 01:23:47.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for test1.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,10 +18,8 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = test1.pl
--
--
--
--
-+subdirs += test1
- 
-+EXTRA_DIST += \
-+	test1/test1.pl
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/turkish/Makefile.am xindy/make-rules/alphabets/turkish/Makefile.am
---- xindy.orig/make-rules/alphabets/turkish/Makefile.am	2008-01-09 15:01:10.000000000 +0100
-+++ xindy/make-rules/alphabets/turkish/Makefile.am	2009-12-17 21:23:04.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for turkish.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = latin3.pl latin5.pl utf8.pl.in
-+subdirs += turkish
- 
--CLEANFILES = \
--	latin3.raw \
--	latin3-doc.tex \
--	latin5.raw \
--	latin5-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	turkish/latin3-lang.xdy turkish/latin3-test.xdy turkish/latin3.xdy \
-+	turkish/latin5-lang.xdy turkish/latin5-test.xdy turkish/latin5.xdy \
-+	turkish/utf8-lang.xdy turkish/utf8-test.xdy turkish/utf8.xdy
- 
-+DOCS_LATIN3 += \
-+	turkish/latin3-doc.tex
- 
-+DOCS_LATIN5 += \
-+	turkish/latin5-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	turkish/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	turkish/utf8.pl.in
-+
-+CLEANFILES += \
-+	turkish/latin3.pl turkish/latin3.raw \
-+	turkish/latin5.pl turkish/latin5.raw \
-+	turkish/utf8.pl turkish/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/ukrainian/Makefile.am xindy/make-rules/alphabets/ukrainian/Makefile.am
---- xindy.orig/make-rules/alphabets/ukrainian/Makefile.am	2008-01-09 15:01:10.000000000 +0100
-+++ xindy/make-rules/alphabets/ukrainian/Makefile.am	2009-12-17 21:23:41.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for ukrainian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1251.pl koi8-u.pl utf8.pl.in
-+subdirs += ukrainian
- 
--CLEANFILES = \
--	cp1251.raw \
--	cp1251-doc.tex \
--	koi8-u.raw \
--	koi8-u-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	ukrainian/cp1251-lang.xdy ukrainian/cp1251-test.xdy ukrainian/cp1251.xdy \
-+	ukrainian/koi8-u-lang.xdy ukrainian/koi8-u-test.xdy ukrainian/koi8-u.xdy \
-+	ukrainian/utf8-lang.xdy ukrainian/utf8-test.xdy ukrainian/utf8.xdy
- 
-+DOCS_CYR_1251 += \
-+	ukrainian/cp1251-doc.tex
- 
-+DOCS_CYR_KOI8_U += \
-+	ukrainian/koi8-u-doc.tex
- 
-+DOCS_UTF8_CYR += \
-+	ukrainian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	ukrainian/utf8.pl.in
-+
-+CLEANFILES += \
-+	ukrainian/cp1251.pl ukrainian/cp1251.raw \
-+	ukrainian/koi8-u.pl ukrainian/koi8-u.raw \
-+	ukrainian/utf8.pl ukrainian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/upper-sorbian/Makefile.am xindy/make-rules/alphabets/upper-sorbian/Makefile.am
---- xindy.orig/make-rules/alphabets/upper-sorbian/Makefile.am	2008-01-09 15:01:09.000000000 +0100
-+++ xindy/make-rules/alphabets/upper-sorbian/Makefile.am	2010-01-09 00:52:48.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for upper-sorbian.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,16 +18,27 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
-+subdirs += upper-sorbian
- 
--CLEANFILES = \
--	cp1250.raw \
--	cp1250-doc.tex \
--	latin2.raw \
--	latin2-doc.tex \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	upper-sorbian/cp1250-lang.xdy upper-sorbian/cp1250-test.xdy upper-sorbian/cp1250.xdy \
-+	upper-sorbian/latin2-lang.xdy upper-sorbian/latin2-test.xdy upper-sorbian/latin2.xdy \
-+	upper-sorbian/utf8-lang.xdy upper-sorbian/utf8-test.xdy upper-sorbian/utf8.xdy
- 
-+DOCS_CP1250 += \
-+	upper-sorbian/cp1250-doc.tex
- 
-+DOCS_LATIN2 += \
-+	upper-sorbian/latin2-doc.tex
- 
-+DOCS_UTF8_LAT += \
-+	upper-sorbian/utf8-doc.tex
-+
-+EXTRA_DIST += \
-+	upper-sorbian/utf8.pl.in
-+
-+CLEANFILES += \
-+	upper-sorbian/cp1250.pl upper-sorbian/cp1250.raw \
-+	upper-sorbian/latin2.pl upper-sorbian/latin2.raw \
-+	upper-sorbian/utf8.pl upper-sorbian/utf8.raw
- 
-diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/vietnamese/Makefile.am xindy/make-rules/alphabets/vietnamese/Makefile.am
---- xindy.orig/make-rules/alphabets/vietnamese/Makefile.am	2008-01-09 15:01:05.000000000 +0100
-+++ xindy/make-rules/alphabets/vietnamese/Makefile.am	2009-12-17 21:24:35.000000000 +0100
-@@ -1,7 +1,6 @@
--## Use `autoreconf' in top-level directory to recreate all
--## autoconf/automake files.
--## Or, call `automake Makefile' to create only Makefile.in.
-+## Makefile fragment for vietnamese.
- 
-+## Copyright (C) 2009 by Peter Breitenlohner.
- ## Copyright (C) 2004-2005 by Gour.
- ##
- ## This program is free software; you can redistribute it and/or
-@@ -19,12 +18,17 @@
- ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- ## Boston, MA 02110-1301 USA.
- 
--EXTRA_DIST = utf8.pl.in
-+subdirs += vietnamese
- 
--CLEANFILES = \
--	utf8.raw \
--	utf8-doc.tex
-+nobase_nodist_lang_DATA += \
-+	vietnamese/utf8-lang.xdy vietnamese/utf8-test.xdy vietnamese/utf8.xdy
- 
-+DOCS_UTF8_LAT += \
-+	vietnamese/utf8-doc.tex
- 
-+EXTRA_DIST += \
-+	vietnamese/utf8.pl.in
- 
-+CLEANFILES += \
-+	vietnamese/utf8.pl vietnamese/utf8.raw
- 
++_EOF
++			print_extra rom-comma-kludge.sed
++		;;
++	esac
++	print_extra_plin $PLIN
++	test -n "$print_extra_hdr_done" && printf '\n'
++	print_pl $PL
++	print_clean $XDY
++	echo
++}
++
++all_langs () {
++	while read line
++	do
++		parse_lang $line
++		mkdir -p $lang
++		make_lang >$lang/Makefile.tmp
++		if diff $lang/Makefile.tmp $lang/Makefile.am >/dev/null 2>&1; then
++			rm -f $lang/Makefile.tmp
++		else
++			mv -f $lang/Makefile.tmp $lang/Makefile.am
++		fi
++	done
++}
++
++all_langs < lang.defs
diff --git a/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-50-reorg-alphabets-generated b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-50-reorg-alphabets-generated
new file mode 100644
index 00000000000..8727a3ceaa3
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy-2.4-pre2-PATCHES/patch-50-reorg-alphabets-generated
@@ -0,0 +1,2745 @@
+	These are the generated Makefile fragments
+
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/albanian/Makefile.am xindy/make-rules/alphabets/albanian/Makefile.am
+--- xindy.orig/make-rules/alphabets/albanian/Makefile.am	2008-01-09 15:01:31.000000000 +0100
++++ xindy/make-rules/alphabets/albanian/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for albanian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin1.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin1.raw \
+-	latin1-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += albanian
+ 
++nobase_nodist_lang_DATA += \
++	albanian/utf8-lang.xdy \
++	albanian/utf8-test.xdy \
++	albanian/utf8.xdy \
++	albanian/latin1-lang.xdy \
++	albanian/latin1-test.xdy \
++	albanian/latin1.xdy
++
++DOCS_LATIN1 += \
++	albanian/latin1-doc.tex
++
++DOCS_UTF8_LAT += \
++	albanian/utf8-doc.tex
++
++EXTRA_DIST += \
++	albanian/utf8.pl.in
++
++dist_noinst_DATA += \
++	albanian/latin1.pl
++
++CLEANFILES += \
++	albanian/utf8.pl \
++	albanian/utf8.raw \
++	albanian/latin1.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/belarusian/Makefile.am xindy/make-rules/alphabets/belarusian/Makefile.am
+--- xindy.orig/make-rules/alphabets/belarusian/Makefile.am	2008-01-09 15:01:30.000000000 +0100
++++ xindy/make-rules/alphabets/belarusian/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for belarusian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,19 +18,46 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1251.pl iso88595.pl isoir111.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1251.raw \
+-	cp1251-doc.tex \
+-	iso88595.raw \
+-	iso88595-doc.tex \
+-	isoir111.raw \
+-	isoir111-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
+-
++subdirs += belarusian
+ 
++nobase_nodist_lang_DATA += \
++	belarusian/utf8-lang.xdy \
++	belarusian/utf8-test.xdy \
++	belarusian/utf8.xdy \
++	belarusian/iso88595-lang.xdy \
++	belarusian/iso88595-test.xdy \
++	belarusian/iso88595.xdy \
++	belarusian/isoir111-lang.xdy \
++	belarusian/isoir111-test.xdy \
++	belarusian/isoir111.xdy \
++	belarusian/cp1251-lang.xdy \
++	belarusian/cp1251-test.xdy \
++	belarusian/cp1251.xdy
++
++DOCS_CYR_1251 += \
++	belarusian/cp1251-doc.tex
++
++DOCS_CYR_ISO88595 += \
++	belarusian/iso88595-doc.tex
++
++DOCS_CYR_ISOIR111 += \
++	belarusian/isoir111-doc.tex
++
++DOCS_UTF8_CYR += \
++	belarusian/utf8-doc.tex
++
++EXTRA_DIST += \
++	belarusian/utf8.pl.in
++
++dist_noinst_DATA += \
++	belarusian/iso88595.pl \
++	belarusian/isoir111.pl \
++	belarusian/cp1251.pl
++
++CLEANFILES += \
++	belarusian/utf8.pl \
++	belarusian/utf8.raw \
++	belarusian/iso88595.raw \
++	belarusian/isoir111.raw \
++	belarusian/cp1251.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/bulgarian/Makefile.am xindy/make-rules/alphabets/bulgarian/Makefile.am
+--- xindy.orig/make-rules/alphabets/bulgarian/Makefile.am	2008-01-09 15:01:30.000000000 +0100
++++ xindy/make-rules/alphabets/bulgarian/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for bulgarian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,19 +18,46 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1251.pl iso88595.pl koi8-r.pl utf8.pl.in
+-
+-
+-CLEANFILES = \
+-	cp1251.raw \
+-	cp1251-doc.tex \
+-	iso88595.raw \
+-	iso88595-doc.tex \
+-	koi8-r.raw \
+-	koi8-r-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += bulgarian
+ 
++nobase_nodist_lang_DATA += \
++	bulgarian/utf8-lang.xdy \
++	bulgarian/utf8-test.xdy \
++	bulgarian/utf8.xdy \
++	bulgarian/iso88595-lang.xdy \
++	bulgarian/iso88595-test.xdy \
++	bulgarian/iso88595.xdy \
++	bulgarian/koi8-r-lang.xdy \
++	bulgarian/koi8-r-test.xdy \
++	bulgarian/koi8-r.xdy \
++	bulgarian/cp1251-lang.xdy \
++	bulgarian/cp1251-test.xdy \
++	bulgarian/cp1251.xdy
++
++DOCS_CYR_1251 += \
++	bulgarian/cp1251-doc.tex
++
++DOCS_CYR_ISO88595 += \
++	bulgarian/iso88595-doc.tex
++
++DOCS_CYR_KOI8_R += \
++	bulgarian/koi8-r-doc.tex
++
++DOCS_UTF8_CYR += \
++	bulgarian/utf8-doc.tex
++
++EXTRA_DIST += \
++	bulgarian/utf8.pl.in
++
++dist_noinst_DATA += \
++	bulgarian/iso88595.pl \
++	bulgarian/koi8-r.pl \
++	bulgarian/cp1251.pl
++
++CLEANFILES += \
++	bulgarian/utf8.pl \
++	bulgarian/utf8.raw \
++	bulgarian/iso88595.raw \
++	bulgarian/koi8-r.raw \
++	bulgarian/cp1251.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/croatian/Makefile.am xindy/make-rules/alphabets/croatian/Makefile.am
+--- xindy.orig/make-rules/alphabets/croatian/Makefile.am	2008-01-09 15:01:29.000000000 +0100
++++ xindy/make-rules/alphabets/croatian/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for croatian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1250.raw \
+-	cp1250-doc.tex \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += croatian
+ 
++nobase_nodist_lang_DATA += \
++	croatian/utf8-lang.xdy \
++	croatian/utf8-test.xdy \
++	croatian/utf8.xdy \
++	croatian/cp1250-lang.xdy \
++	croatian/cp1250-test.xdy \
++	croatian/cp1250.xdy \
++	croatian/latin2-lang.xdy \
++	croatian/latin2-test.xdy \
++	croatian/latin2.xdy
++
++DOCS_CP1250 += \
++	croatian/cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	croatian/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	croatian/utf8-doc.tex
++
++EXTRA_DIST += \
++	croatian/utf8.pl.in
++
++dist_noinst_DATA += \
++	croatian/cp1250.pl \
++	croatian/latin2.pl
++
++CLEANFILES += \
++	croatian/utf8.pl \
++	croatian/utf8.raw \
++	croatian/cp1250.raw \
++	croatian/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/czech/Makefile.am xindy/make-rules/alphabets/czech/Makefile.am
+--- xindy.orig/make-rules/alphabets/czech/Makefile.am	2008-01-09 15:01:29.000000000 +0100
++++ xindy/make-rules/alphabets/czech/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for czech.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1250.raw \
+-	cp1250-doc.tex \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += czech
+ 
++nobase_nodist_lang_DATA += \
++	czech/utf8-lang.xdy \
++	czech/utf8-test.xdy \
++	czech/utf8.xdy \
++	czech/cp1250-lang.xdy \
++	czech/cp1250-test.xdy \
++	czech/cp1250.xdy \
++	czech/latin2-lang.xdy \
++	czech/latin2-test.xdy \
++	czech/latin2.xdy
++
++DOCS_CP1250 += \
++	czech/cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	czech/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	czech/utf8-doc.tex
++
++EXTRA_DIST += \
++	czech/utf8.pl.in
++
++dist_noinst_DATA += \
++	czech/cp1250.pl \
++	czech/latin2.pl
++
++CLEANFILES += \
++	czech/utf8.pl \
++	czech/utf8.raw \
++	czech/cp1250.raw \
++	czech/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/danish/Makefile.am xindy/make-rules/alphabets/danish/Makefile.am
+--- xindy.orig/make-rules/alphabets/danish/Makefile.am	2008-01-09 15:01:28.000000000 +0100
++++ xindy/make-rules/alphabets/danish/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for danish.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,19 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-    cp1252.pl latin9.pl utf8.pl.in \
+-    latin1.xdy
+-
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	latin9.raw \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += danish
+ 
++nobase_nodist_lang_DATA += \
++	danish/utf8-lang.xdy \
++	danish/utf8-test.xdy \
++	danish/utf8.xdy \
++	danish/cp1252-lang.xdy \
++	danish/cp1252-test.xdy \
++	danish/cp1252.xdy \
++	danish/latin9-lang.xdy \
++	danish/latin9-test.xdy \
++	danish/latin9.xdy
++
++DOCS_CP1252 += \
++	danish/cp1252-doc.tex
++
++DOCS_LATIN9 += \
++	danish/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	danish/utf8-doc.tex
++
++EXTRA_DIST += \
++	danish/utf8.pl.in
++
++dist_noinst_DATA += \
++	danish/cp1252.pl \
++	danish/latin9.pl
++
++CLEANFILES += \
++	danish/utf8.pl \
++	danish/utf8.raw \
++	danish/cp1252.raw \
++	danish/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/dutch/Makefile.am xindy/make-rules/alphabets/dutch/Makefile.am
+--- xindy.orig/make-rules/alphabets/dutch/Makefile.am	2008-01-09 15:01:27.000000000 +0100
++++ xindy/make-rules/alphabets/dutch/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for dutch.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,18 +18,37 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	ij-as-ij-latin1.pl ij-as-y-utf8.pl.in ij-as-ij-utf8.pl.in \
+-	latin1.xdy tex-latin1.xdy
+-
+-CLEANFILES = \
+-	ij-as-ij-latin1.raw \
+-	ij-as-ij-latin1-doc.tex \
+-	ij-as-ij-utf8.raw \
+-	ij-as-ij-utf8-doc.tex \
+-	ij-as-y-utf8.raw \
+-	ij-as-y-utf8-doc.tex
+-
+-
++subdirs += dutch
+ 
++nobase_nodist_lang_DATA += \
++	dutch/ij-as-ij-utf8-lang.xdy \
++	dutch/ij-as-ij-utf8-test.xdy \
++	dutch/ij-as-ij-utf8.xdy \
++	dutch/ij-as-ij-latin1-lang.xdy \
++	dutch/ij-as-ij-latin1-test.xdy \
++	dutch/ij-as-ij-latin1.xdy \
++	dutch/ij-as-y-utf8-lang.xdy \
++	dutch/ij-as-y-utf8-test.xdy \
++	dutch/ij-as-y-utf8.xdy
++
++DOCS_LATIN1 += \
++	dutch/ij-as-ij-latin1-doc.tex
++
++DOCS_UTF8_LAT += \
++	dutch/ij-as-ij-utf8-doc.tex \
++	dutch/ij-as-y-utf8-doc.tex
++
++EXTRA_DIST += \
++	dutch/ij-as-ij-utf8.pl.in \
++	dutch/ij-as-y-utf8.pl.in
++
++dist_noinst_DATA += \
++	dutch/ij-as-ij-latin1.pl
++
++CLEANFILES += \
++	dutch/ij-as-ij-utf8.pl \
++	dutch/ij-as-ij-utf8.raw \
++	dutch/ij-as-ij-latin1.raw \
++	dutch/ij-as-y-utf8.pl \
++	dutch/ij-as-y-utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/english/Makefile.am xindy/make-rules/alphabets/english/Makefile.am
+--- xindy.orig/make-rules/alphabets/english/Makefile.am	2008-01-09 15:01:27.000000000 +0100
++++ xindy/make-rules/alphabets/english/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for english.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,18 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	cp1252.pl latin9.pl  utf8.pl.in \
+-	ascii.xdy tex-ascii.xdy
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	latin9.raw  \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += english
+ 
++nobase_nodist_lang_DATA += \
++	english/utf8-lang.xdy \
++	english/utf8-test.xdy \
++	english/utf8.xdy \
++	english/cp1252-lang.xdy \
++	english/cp1252-test.xdy \
++	english/cp1252.xdy \
++	english/latin9-lang.xdy \
++	english/latin9-test.xdy \
++	english/latin9.xdy
++
++DOCS_CP1252 += \
++	english/cp1252-doc.tex
++
++DOCS_LATIN9 += \
++	english/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	english/utf8-doc.tex
++
++EXTRA_DIST += \
++	english/utf8.pl.in
++
++dist_noinst_DATA += \
++	english/cp1252.pl \
++	english/latin9.pl
++
++CLEANFILES += \
++	english/utf8.pl \
++	english/utf8.raw \
++	english/cp1252.raw \
++	english/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/esperanto/Makefile.am xindy/make-rules/alphabets/esperanto/Makefile.am
+--- xindy.orig/make-rules/alphabets/esperanto/Makefile.am	2008-01-09 15:01:26.000000000 +0100
++++ xindy/make-rules/alphabets/esperanto/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for esperanto.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin3.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin3.raw \
+-	latin3-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += esperanto
+ 
++nobase_nodist_lang_DATA += \
++	esperanto/utf8-lang.xdy \
++	esperanto/utf8-test.xdy \
++	esperanto/utf8.xdy \
++	esperanto/latin3-lang.xdy \
++	esperanto/latin3-test.xdy \
++	esperanto/latin3.xdy
++
++DOCS_LATIN3 += \
++	esperanto/latin3-doc.tex
++
++DOCS_UTF8_LAT += \
++	esperanto/utf8-doc.tex
++
++EXTRA_DIST += \
++	esperanto/utf8.pl.in
++
++dist_noinst_DATA += \
++	esperanto/latin3.pl
++
++CLEANFILES += \
++	esperanto/utf8.pl \
++	esperanto/utf8.raw \
++	esperanto/latin3.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/estonian/Makefile.am xindy/make-rules/alphabets/estonian/Makefile.am
+--- xindy.orig/make-rules/alphabets/estonian/Makefile.am	2008-01-09 15:01:26.000000000 +0100
++++ xindy/make-rules/alphabets/estonian/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for estonian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1252.pl latin9.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	latin9.raw \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += estonian
+ 
++nobase_nodist_lang_DATA += \
++	estonian/utf8-lang.xdy \
++	estonian/utf8-test.xdy \
++	estonian/utf8.xdy \
++	estonian/cp1252-lang.xdy \
++	estonian/cp1252-test.xdy \
++	estonian/cp1252.xdy \
++	estonian/latin9-lang.xdy \
++	estonian/latin9-test.xdy \
++	estonian/latin9.xdy
++
++DOCS_CP1252 += \
++	estonian/cp1252-doc.tex
++
++DOCS_LATIN9 += \
++	estonian/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	estonian/utf8-doc.tex
++
++EXTRA_DIST += \
++	estonian/utf8.pl.in
++
++dist_noinst_DATA += \
++	estonian/cp1252.pl \
++	estonian/latin9.pl
++
++CLEANFILES += \
++	estonian/utf8.pl \
++	estonian/utf8.raw \
++	estonian/cp1252.raw \
++	estonian/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/finnish/Makefile.am xindy/make-rules/alphabets/finnish/Makefile.am
+--- xindy.orig/make-rules/alphabets/finnish/Makefile.am	2008-01-09 15:01:26.000000000 +0100
++++ xindy/make-rules/alphabets/finnish/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for finnish.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,19 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	cp1252.pl latin9.pl utf8.pl.in \
+-	tex-cp1252.xdy  tex-latin9.xdy
+-
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	latin9.raw \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += finnish
+ 
++nobase_nodist_lang_DATA += \
++	finnish/utf8-lang.xdy \
++	finnish/utf8-test.xdy \
++	finnish/utf8.xdy \
++	finnish/cp1252-lang.xdy \
++	finnish/cp1252-test.xdy \
++	finnish/cp1252.xdy \
++	finnish/latin9-lang.xdy \
++	finnish/latin9-test.xdy \
++	finnish/latin9.xdy
++
++DOCS_CP1252 += \
++	finnish/cp1252-doc.tex
++
++DOCS_LATIN9 += \
++	finnish/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	finnish/utf8-doc.tex
++
++EXTRA_DIST += \
++	finnish/utf8.pl.in
++
++dist_noinst_DATA += \
++	finnish/cp1252.pl \
++	finnish/latin9.pl
++
++CLEANFILES += \
++	finnish/utf8.pl \
++	finnish/utf8.raw \
++	finnish/cp1252.raw \
++	finnish/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/french/Makefile.am xindy/make-rules/alphabets/french/Makefile.am
+--- xindy.orig/make-rules/alphabets/french/Makefile.am	2008-01-09 15:01:25.000000000 +0100
++++ xindy/make-rules/alphabets/french/Makefile.am	2010-01-13 13:01:55.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for french.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1252.pl latin9.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	latin9.raw \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += french
+ 
++nobase_nodist_lang_DATA += \
++	french/utf8-lang.xdy \
++	french/utf8-test.xdy \
++	french/utf8.xdy \
++	french/cp1252-lang.xdy \
++	french/cp1252-test.xdy \
++	french/cp1252.xdy \
++	french/latin9-lang.xdy \
++	french/latin9-test.xdy \
++	french/latin9.xdy
++
++DOCS_CP1252 += \
++	french/cp1252-doc.tex
++
++DOCS_LATIN9 += \
++	french/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	french/utf8-doc.tex
++
++EXTRA_DIST += \
++	french/utf8.pl.in
++
++dist_noinst_DATA += \
++	french/cp1252.pl \
++	french/latin9.pl
++
++CLEANFILES += \
++	french/utf8.pl \
++	french/utf8.raw \
++	french/cp1252.raw \
++	french/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/general/Makefile.am xindy/make-rules/alphabets/general/Makefile.am
+--- xindy.orig/make-rules/alphabets/general/Makefile.am	2008-01-09 15:01:25.000000000 +0100
++++ xindy/make-rules/alphabets/general/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for general.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,20 +18,47 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	cp1252.pl cp850.pl latin9.pl template.pl utf8.pl.in \
+-	latin1.xdy
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	cp850.raw \
+-	cp850-doc.tex \
+-	latin9.raw \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += general
+ 
++nobase_nodist_lang_DATA += \
++	general/utf8-lang.xdy \
++	general/utf8-test.xdy \
++	general/utf8.xdy \
++	general/cp1252-lang.xdy \
++	general/cp1252-test.xdy \
++	general/cp1252.xdy \
++	general/cp850-lang.xdy \
++	general/cp850-test.xdy \
++	general/cp850.xdy \
++	general/latin9-lang.xdy \
++	general/latin9-test.xdy \
++	general/latin9.xdy
++
++DOCS_CP1252 += \
++	general/cp1252-doc.tex
++
++DOCS_CP850 += \
++	general/cp850-doc.tex
++
++DOCS_LATIN9 += \
++	general/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	general/utf8-doc.tex
++
++EXTRA_DIST += \
++	general/utf8.pl.in
++
++dist_noinst_DATA += \
++	general/cp1252.pl \
++	general/cp850.pl \
++	general/latin9.pl \
++	general/template.pl
++
++CLEANFILES += \
++	general/utf8.pl \
++	general/utf8.raw \
++	general/cp1252.raw \
++	general/cp850.raw \
++	general/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/georgian/Makefile.am xindy/make-rules/alphabets/georgian/Makefile.am
+--- xindy.orig/make-rules/alphabets/georgian/Makefile.am	2008-01-09 15:01:24.000000000 +0100
++++ xindy/make-rules/alphabets/georgian/Makefile.am	2010-01-13 11:41:18.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for georgian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,12 +18,20 @@
+ ## 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
+-
+-
++subdirs += georgian
+ 
++nobase_nodist_lang_DATA += \
++	georgian/utf8-lang.xdy \
++	georgian/utf8-test.xdy \
++	georgian/utf8.xdy
++
++DOCS_UTF8_OTHER += \
++	georgian/utf8-doc.tex
++
++EXTRA_DIST += \
++	georgian/utf8.pl.in
++
++CLEANFILES += \
++	georgian/utf8.pl \
++	georgian/utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/german/Makefile.am xindy/make-rules/alphabets/german/Makefile.am
+--- xindy.orig/make-rules/alphabets/german/Makefile.am	2008-01-09 15:01:22.000000000 +0100
++++ xindy/make-rules/alphabets/german/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for german.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,23 +18,52 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	braille-utf8.pl.in  duden-latin1.pl \
+-	din5007-latin1.pl duden-utf8.pl.in din5007-utf8.pl.in \
+-	tex-din5007-latin1.xdy tex-duden-latin1.xdy tex-latin1.xdy
+-
+-CLEANFILES = \
+-	braille-utf8.raw \
+-	braille-utf8-doc.tex \
+-	din5007-latin1.raw \
+-	din5007-latin1-doc.tex \
+-	din5007-utf8.raw \
+-	din5007-utf8-doc.tex \
+-	duden-latin1.raw \
+-	duden-latin1-doc.tex \
+-	duden-utf8.raw \
+-	duden-utf8-doc.tex
+-
+-
++subdirs += german
+ 
++nobase_nodist_lang_DATA += \
++	german/braille-utf8-lang.xdy \
++	german/braille-utf8-test.xdy \
++	german/braille-utf8.xdy \
++	german/din5007-utf8-lang.xdy \
++	german/din5007-utf8-test.xdy \
++	german/din5007-utf8.xdy \
++	german/din5007-latin1-lang.xdy \
++	german/din5007-latin1-test.xdy \
++	german/din5007-latin1.xdy \
++	german/duden-utf8-lang.xdy \
++	german/duden-utf8-test.xdy \
++	german/duden-utf8.xdy \
++	german/duden-latin1-lang.xdy \
++	german/duden-latin1-test.xdy \
++	german/duden-latin1.xdy
++
++DOCS_LATIN1 += \
++	german/din5007-latin1-doc.tex \
++	german/duden-latin1-doc.tex
++
++DOCS_UTF8_LAT += \
++	german/din5007-utf8-doc.tex \
++	german/duden-utf8-doc.tex
++
++DOCS_UTF8_OTHER += \
++	german/braille-utf8-doc.tex
++
++EXTRA_DIST += \
++	german/braille-utf8.pl.in \
++	german/din5007-utf8.pl.in \
++	german/duden-utf8.pl.in
++
++dist_noinst_DATA += \
++	german/din5007-latin1.pl \
++	german/duden-latin1.pl
++
++CLEANFILES += \
++	german/braille-utf8.pl \
++	german/braille-utf8.raw \
++	german/din5007-utf8.pl \
++	german/din5007-utf8.raw \
++	german/din5007-latin1.raw \
++	german/duden-utf8.pl \
++	german/duden-utf8.raw \
++	german/duden-latin1.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/greek/Makefile.am xindy/make-rules/alphabets/greek/Makefile.am
+--- xindy.orig/make-rules/alphabets/greek/Makefile.am	2008-01-09 15:01:22.000000000 +0100
++++ xindy/make-rules/alphabets/greek/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for greek.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,24 +18,54 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	iso88597.pl  polytonic-utf8.pl.in utf8.pl.in \
+-	translit-latin4.pl translit-utf8.pl.in \
+-	translit-tex.xdy
+-
+-
+-CLEANFILES = \
+-	iso88597.raw \
+-	iso88597-doc.tex \
+-	polytonic-utf8.raw \
+-	polytonic-utf8-doc.tex \
+-	translit-latin4.raw \
+-	translit-latin4-doc.tex \
+-	translit-utf8.raw \
+-	translit-utf8-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += greek
+ 
++nobase_nodist_lang_DATA += \
++	greek/utf8-lang.xdy \
++	greek/utf8-test.xdy \
++	greek/utf8.xdy \
++	greek/iso88597-lang.xdy \
++	greek/iso88597-test.xdy \
++	greek/iso88597.xdy \
++	greek/polytonic-utf8-lang.xdy \
++	greek/polytonic-utf8-test.xdy \
++	greek/polytonic-utf8.xdy \
++	greek/translit-utf8-lang.xdy \
++	greek/translit-utf8-test.xdy \
++	greek/translit-utf8.xdy \
++	greek/translit-latin4-lang.xdy \
++	greek/translit-latin4-test.xdy \
++	greek/translit-latin4.xdy
++
++DOCS_LATIN4 += \
++	greek/translit-latin4-doc.tex
++
++DOCS_ISO88597 += \
++	greek/iso88597-doc.tex
++
++DOCS_UTF8_LAT += \
++	greek/translit-utf8-doc.tex
++
++DOCS_UTF8_OTHER += \
++	greek/utf8-doc.tex \
++	greek/polytonic-utf8-doc.tex
++
++EXTRA_DIST += \
++	greek/utf8.pl.in \
++	greek/polytonic-utf8.pl.in \
++	greek/translit-utf8.pl.in
++
++dist_noinst_DATA += \
++	greek/iso88597.pl \
++	greek/translit-latin4.pl
++
++CLEANFILES += \
++	greek/utf8.pl \
++	greek/utf8.raw \
++	greek/iso88597.raw \
++	greek/polytonic-utf8.pl \
++	greek/polytonic-utf8.raw \
++	greek/translit-utf8.pl \
++	greek/translit-utf8.raw \
++	greek/translit-latin4.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/gypsy/Makefile.am xindy/make-rules/alphabets/gypsy/Makefile.am
+--- xindy.orig/make-rules/alphabets/gypsy/Makefile.am	2008-01-09 15:01:21.000000000 +0100
++++ xindy/make-rules/alphabets/gypsy/Makefile.am	2010-01-13 11:41:18.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for gypsy.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,11 +18,20 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = northrussian-utf8.pl.in
+-
+-CLEANFILES = \
+-	northrussian-utf8.raw \
+-	northrussian-utf8-doc.tex
+-
++subdirs += gypsy
+ 
++nobase_nodist_lang_DATA += \
++	gypsy/northrussian-utf8-lang.xdy \
++	gypsy/northrussian-utf8-test.xdy \
++	gypsy/northrussian-utf8.xdy
++
++DOCS_UTF8_LAT += \
++	gypsy/northrussian-utf8-doc.tex
++
++EXTRA_DIST += \
++	gypsy/northrussian-utf8.pl.in
++
++CLEANFILES += \
++	gypsy/northrussian-utf8.pl \
++	gypsy/northrussian-utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hausa/Makefile.am xindy/make-rules/alphabets/hausa/Makefile.am
+--- xindy.orig/make-rules/alphabets/hausa/Makefile.am	2008-01-09 15:01:21.000000000 +0100
++++ xindy/make-rules/alphabets/hausa/Makefile.am	2010-01-13 11:41:18.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for hausa.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,12 +18,20 @@
+ ## 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
+-
+-
++subdirs += hausa
+ 
++nobase_nodist_lang_DATA += \
++	hausa/utf8-lang.xdy \
++	hausa/utf8-test.xdy \
++	hausa/utf8.xdy
++
++DOCS_UTF8_LAT += \
++	hausa/utf8-doc.tex
++
++EXTRA_DIST += \
++	hausa/utf8.pl.in
++
++CLEANFILES += \
++	hausa/utf8.pl \
++	hausa/utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hebrew/Makefile.am xindy/make-rules/alphabets/hebrew/Makefile.am
+--- xindy.orig/make-rules/alphabets/hebrew/Makefile.am	2008-01-09 15:01:21.000000000 +0100
++++ xindy/make-rules/alphabets/hebrew/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for hebrew.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = iso88598.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	iso88598.raw \
+-	iso88598-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += hebrew
+ 
++nobase_nodist_lang_DATA += \
++	hebrew/utf8-lang.xdy \
++	hebrew/utf8-test.xdy \
++	hebrew/utf8.xdy \
++	hebrew/iso88598-lang.xdy \
++	hebrew/iso88598-test.xdy \
++	hebrew/iso88598.xdy
++
++DOCS_ISO88598 += \
++	hebrew/iso88598-doc.tex
++
++DOCS_UTF8_OTHER += \
++	hebrew/utf8-doc.tex
++
++EXTRA_DIST += \
++	hebrew/utf8.pl.in
++
++dist_noinst_DATA += \
++	hebrew/iso88598.pl
++
++CLEANFILES += \
++	hebrew/utf8.pl \
++	hebrew/utf8.raw \
++	hebrew/iso88598.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hungarian/Makefile.am xindy/make-rules/alphabets/hungarian/Makefile.am
+--- xindy.orig/make-rules/alphabets/hungarian/Makefile.am	2008-01-09 15:01:20.000000000 +0100
++++ xindy/make-rules/alphabets/hungarian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for hungarian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1250.raw \
+-	cp1250-doc.tex \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += hungarian
+ 
++nobase_nodist_lang_DATA += \
++	hungarian/utf8-lang.xdy \
++	hungarian/utf8-test.xdy \
++	hungarian/utf8.xdy \
++	hungarian/cp1250-lang.xdy \
++	hungarian/cp1250-test.xdy \
++	hungarian/cp1250.xdy \
++	hungarian/latin2-lang.xdy \
++	hungarian/latin2-test.xdy \
++	hungarian/latin2.xdy
++
++DOCS_CP1250 += \
++	hungarian/cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	hungarian/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	hungarian/utf8-doc.tex
++
++EXTRA_DIST += \
++	hungarian/utf8.pl.in
++
++dist_noinst_DATA += \
++	hungarian/cp1250.pl \
++	hungarian/latin2.pl
++
++CLEANFILES += \
++	hungarian/utf8.pl \
++	hungarian/utf8.raw \
++	hungarian/cp1250.raw \
++	hungarian/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/icelandic/Makefile.am xindy/make-rules/alphabets/icelandic/Makefile.am
+--- xindy.orig/make-rules/alphabets/icelandic/Makefile.am	2008-01-09 15:01:20.000000000 +0100
++++ xindy/make-rules/alphabets/icelandic/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for icelandic.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,19 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	cp1252.pl latin9.pl utf8.pl.in \
+-	latin1.xdy
+-
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	latin9.raw \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += icelandic
+ 
++nobase_nodist_lang_DATA += \
++	icelandic/utf8-lang.xdy \
++	icelandic/utf8-test.xdy \
++	icelandic/utf8.xdy \
++	icelandic/cp1252-lang.xdy \
++	icelandic/cp1252-test.xdy \
++	icelandic/cp1252.xdy \
++	icelandic/latin9-lang.xdy \
++	icelandic/latin9-test.xdy \
++	icelandic/latin9.xdy
++
++DOCS_CP1252 += \
++	icelandic/cp1252-doc.tex
++
++DOCS_LATIN9 += \
++	icelandic/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	icelandic/utf8-doc.tex
++
++EXTRA_DIST += \
++	icelandic/utf8.pl.in
++
++dist_noinst_DATA += \
++	icelandic/cp1252.pl \
++	icelandic/latin9.pl
++
++CLEANFILES += \
++	icelandic/utf8.pl \
++	icelandic/utf8.raw \
++	icelandic/cp1252.raw \
++	icelandic/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/italian/Makefile.am xindy/make-rules/alphabets/italian/Makefile.am
+--- xindy.orig/make-rules/alphabets/italian/Makefile.am	2008-01-09 15:01:19.000000000 +0100
++++ xindy/make-rules/alphabets/italian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for italian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin1.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin1.raw \
+-	latin1-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += italian
+ 
++nobase_nodist_lang_DATA += \
++	italian/utf8-lang.xdy \
++	italian/utf8-test.xdy \
++	italian/utf8.xdy \
++	italian/latin1-lang.xdy \
++	italian/latin1-test.xdy \
++	italian/latin1.xdy
++
++DOCS_LATIN1 += \
++	italian/latin1-doc.tex
++
++DOCS_UTF8_LAT += \
++	italian/utf8-doc.tex
++
++EXTRA_DIST += \
++	italian/utf8.pl.in
++
++dist_noinst_DATA += \
++	italian/latin1.pl
++
++CLEANFILES += \
++	italian/utf8.pl \
++	italian/utf8.raw \
++	italian/latin1.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/klingon/Makefile.am xindy/make-rules/alphabets/klingon/Makefile.am
+--- xindy.orig/make-rules/alphabets/klingon/Makefile.am	2008-01-09 15:01:19.000000000 +0100
++++ xindy/make-rules/alphabets/klingon/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for klingon.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,15 +18,23 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	utf8.pl.in \
+-	translit-ascii.pl
++subdirs += klingon
+ 
++nobase_nodist_lang_DATA += \
++	klingon/utf8-lang.xdy \
++	klingon/utf8-test.xdy \
++	klingon/utf8.xdy
+ 
+-CLEANFILES = \
+-	utf8.raw \
+-	utf8-doc.tex
++DOCS_UTF8_OTHER += \
++	klingon/utf8-doc.tex
+ 
++EXTRA_DIST += \
++	klingon/utf8.pl.in
+ 
++dist_noinst_DATA += \
++	klingon/translit-ascii.pl
+ 
++CLEANFILES += \
++	klingon/utf8.pl \
++	klingon/utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/kurdish/Makefile.am xindy/make-rules/alphabets/kurdish/Makefile.am
+--- xindy.orig/make-rules/alphabets/kurdish/Makefile.am	2008-01-09 15:01:18.000000000 +0100
++++ xindy/make-rules/alphabets/kurdish/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for kurdish.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,20 +18,43 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-	bedirxan-latin5.pl bedirxan-utf8.pl.in \
+-	turkish-i-latin5.pl turkish-i-utf8.pl.in \
+-	latin5.xdy
+-
+-CLEANFILES = \
+-	bedirxan-latin5.raw \
+-	bedirxan-latin5-doc.tex \
+-	bedirxan-utf8.raw \
+-	bedirxan-utf8-doc.tex \
+-	turkish-i-latin5.raw \
+-	turkish-i-latin5-doc.tex \
+-	turkish-i-utf8.raw \
+-	turkish-i-utf8-doc.tex
+-
++subdirs += kurdish
+ 
++nobase_nodist_lang_DATA += \
++	kurdish/bedirxan-utf8-lang.xdy \
++	kurdish/bedirxan-utf8-test.xdy \
++	kurdish/bedirxan-utf8.xdy \
++	kurdish/bedirxan-latin5-lang.xdy \
++	kurdish/bedirxan-latin5-test.xdy \
++	kurdish/bedirxan-latin5.xdy \
++	kurdish/turkish-i-utf8-lang.xdy \
++	kurdish/turkish-i-utf8-test.xdy \
++	kurdish/turkish-i-utf8.xdy \
++	kurdish/turkish-i-latin5-lang.xdy \
++	kurdish/turkish-i-latin5-test.xdy \
++	kurdish/turkish-i-latin5.xdy
++
++DOCS_LATIN5 += \
++	kurdish/bedirxan-latin5-doc.tex \
++	kurdish/turkish-i-latin5-doc.tex
++
++DOCS_UTF8_LAT += \
++	kurdish/bedirxan-utf8-doc.tex \
++	kurdish/turkish-i-utf8-doc.tex
++
++EXTRA_DIST += \
++	kurdish/bedirxan-utf8.pl.in \
++	kurdish/turkish-i-utf8.pl.in
++
++dist_noinst_DATA += \
++	kurdish/bedirxan-latin5.pl \
++	kurdish/turkish-i-latin5.pl
++
++CLEANFILES += \
++	kurdish/bedirxan-utf8.pl \
++	kurdish/bedirxan-utf8.raw \
++	kurdish/bedirxan-latin5.raw \
++	kurdish/turkish-i-utf8.pl \
++	kurdish/turkish-i-utf8.raw \
++	kurdish/turkish-i-latin5.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/latin/Makefile.am xindy/make-rules/alphabets/latin/Makefile.am
+--- xindy.orig/make-rules/alphabets/latin/Makefile.am	2008-01-09 15:01:18.000000000 +0100
++++ xindy/make-rules/alphabets/latin/Makefile.am	2010-01-13 11:41:18.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for latin.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,12 +18,20 @@
+ ## 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
+-
+-
++subdirs += latin
+ 
++nobase_nodist_lang_DATA += \
++	latin/utf8-lang.xdy \
++	latin/utf8-test.xdy \
++	latin/utf8.xdy
++
++DOCS_UTF8_LAT += \
++	latin/utf8-doc.tex
++
++EXTRA_DIST += \
++	latin/utf8.pl.in
++
++CLEANFILES += \
++	latin/utf8.pl \
++	latin/utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/latvian/Makefile.am xindy/make-rules/alphabets/latvian/Makefile.am
+--- xindy.orig/make-rules/alphabets/latvian/Makefile.am	2008-01-09 15:01:17.000000000 +0100
++++ xindy/make-rules/alphabets/latvian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for latvian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin4.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin4.raw \
+-	latin4-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += latvian
+ 
++nobase_nodist_lang_DATA += \
++	latvian/utf8-lang.xdy \
++	latvian/utf8-test.xdy \
++	latvian/utf8.xdy \
++	latvian/latin4-lang.xdy \
++	latvian/latin4-test.xdy \
++	latvian/latin4.xdy
++
++DOCS_LATIN4 += \
++	latvian/latin4-doc.tex
++
++DOCS_UTF8_LAT += \
++	latvian/utf8-doc.tex
++
++EXTRA_DIST += \
++	latvian/utf8.pl.in
++
++dist_noinst_DATA += \
++	latvian/latin4.pl
++
++CLEANFILES += \
++	latvian/utf8.pl \
++	latvian/utf8.raw \
++	latvian/latin4.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lithuanian/Makefile.am xindy/make-rules/alphabets/lithuanian/Makefile.am
+--- xindy.orig/make-rules/alphabets/lithuanian/Makefile.am	2008-01-09 15:01:17.000000000 +0100
++++ xindy/make-rules/alphabets/lithuanian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for lithuanian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin4.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin4.raw \
+-	latin4-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += lithuanian
+ 
++nobase_nodist_lang_DATA += \
++	lithuanian/utf8-lang.xdy \
++	lithuanian/utf8-test.xdy \
++	lithuanian/utf8.xdy \
++	lithuanian/latin4-lang.xdy \
++	lithuanian/latin4-test.xdy \
++	lithuanian/latin4.xdy
++
++DOCS_LATIN4 += \
++	lithuanian/latin4-doc.tex
++
++DOCS_UTF8_LAT += \
++	lithuanian/utf8-doc.tex
++
++EXTRA_DIST += \
++	lithuanian/utf8.pl.in
++
++dist_noinst_DATA += \
++	lithuanian/latin4.pl
++
++CLEANFILES += \
++	lithuanian/utf8.pl \
++	lithuanian/utf8.raw \
++	lithuanian/latin4.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lower-sorbian/Makefile.am xindy/make-rules/alphabets/lower-sorbian/Makefile.am
+--- xindy.orig/make-rules/alphabets/lower-sorbian/Makefile.am	2008-01-09 15:01:16.000000000 +0100
++++ xindy/make-rules/alphabets/lower-sorbian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for lower-sorbian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1250.raw \
+-	cp1250-doc.tex \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += lower-sorbian
+ 
++nobase_nodist_lang_DATA += \
++	lower-sorbian/utf8-lang.xdy \
++	lower-sorbian/utf8-test.xdy \
++	lower-sorbian/utf8.xdy \
++	lower-sorbian/cp1250-lang.xdy \
++	lower-sorbian/cp1250-test.xdy \
++	lower-sorbian/cp1250.xdy \
++	lower-sorbian/latin2-lang.xdy \
++	lower-sorbian/latin2-test.xdy \
++	lower-sorbian/latin2.xdy
++
++DOCS_CP1250 += \
++	lower-sorbian/cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	lower-sorbian/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	lower-sorbian/utf8-doc.tex
++
++EXTRA_DIST += \
++	lower-sorbian/utf8.pl.in
++
++dist_noinst_DATA += \
++	lower-sorbian/cp1250.pl \
++	lower-sorbian/latin2.pl
++
++CLEANFILES += \
++	lower-sorbian/utf8.pl \
++	lower-sorbian/utf8.raw \
++	lower-sorbian/cp1250.raw \
++	lower-sorbian/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/macedonian/Makefile.am xindy/make-rules/alphabets/macedonian/Makefile.am
+--- xindy.orig/make-rules/alphabets/macedonian/Makefile.am	2008-01-09 15:01:16.000000000 +0100
++++ xindy/make-rules/alphabets/macedonian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for macedonian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,18 +18,46 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1251.pl iso88595.pl isoir111.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1251.raw \
+-	cp1251-doc.tex \
+-	iso88595.raw \
+-	iso88595-doc.tex \
+-	isoir111.raw \
+-	isoir111-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += macedonian
+ 
++nobase_nodist_lang_DATA += \
++	macedonian/utf8-lang.xdy \
++	macedonian/utf8-test.xdy \
++	macedonian/utf8.xdy \
++	macedonian/iso88595-lang.xdy \
++	macedonian/iso88595-test.xdy \
++	macedonian/iso88595.xdy \
++	macedonian/isoir111-lang.xdy \
++	macedonian/isoir111-test.xdy \
++	macedonian/isoir111.xdy \
++	macedonian/cp1251-lang.xdy \
++	macedonian/cp1251-test.xdy \
++	macedonian/cp1251.xdy
++
++DOCS_CYR_1251 += \
++	macedonian/cp1251-doc.tex
++
++DOCS_CYR_ISO88595 += \
++	macedonian/iso88595-doc.tex
++
++DOCS_CYR_ISOIR111 += \
++	macedonian/isoir111-doc.tex
++
++DOCS_UTF8_CYR += \
++	macedonian/utf8-doc.tex
++
++EXTRA_DIST += \
++	macedonian/utf8.pl.in
++
++dist_noinst_DATA += \
++	macedonian/iso88595.pl \
++	macedonian/isoir111.pl \
++	macedonian/cp1251.pl
++
++CLEANFILES += \
++	macedonian/utf8.pl \
++	macedonian/utf8.raw \
++	macedonian/iso88595.raw \
++	macedonian/isoir111.raw \
++	macedonian/cp1251.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/mongolian/Makefile.am xindy/make-rules/alphabets/mongolian/Makefile.am
+--- xindy.orig/make-rules/alphabets/mongolian/Makefile.am	2008-01-09 15:01:15.000000000 +0100
++++ xindy/make-rules/alphabets/mongolian/Makefile.am	2010-01-13 11:41:18.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for mongolian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,12 +18,20 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cyrillic-utf8.pl.in
+-
+-CLEANFILES = \
+-	cyrillic-utf8.raw \
+-	cyrillic-utf8-doc.tex
+-
+-
++subdirs += mongolian
+ 
++nobase_nodist_lang_DATA += \
++	mongolian/cyrillic-utf8-lang.xdy \
++	mongolian/cyrillic-utf8-test.xdy \
++	mongolian/cyrillic-utf8.xdy
++
++DOCS_UTF8_CYR += \
++	mongolian/cyrillic-utf8-doc.tex
++
++EXTRA_DIST += \
++	mongolian/cyrillic-utf8.pl.in
++
++CLEANFILES += \
++	mongolian/cyrillic-utf8.pl \
++	mongolian/cyrillic-utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/norwegian/Makefile.am xindy/make-rules/alphabets/norwegian/Makefile.am
+--- xindy.orig/make-rules/alphabets/norwegian/Makefile.am	2008-01-09 15:01:15.000000000 +0100
++++ xindy/make-rules/alphabets/norwegian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for norwegian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin1.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin1.raw \
+-	latin1-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += norwegian
+ 
++nobase_nodist_lang_DATA += \
++	norwegian/utf8-lang.xdy \
++	norwegian/utf8-test.xdy \
++	norwegian/utf8.xdy \
++	norwegian/latin1-lang.xdy \
++	norwegian/latin1-test.xdy \
++	norwegian/latin1.xdy
++
++DOCS_LATIN1 += \
++	norwegian/latin1-doc.tex
++
++DOCS_UTF8_LAT += \
++	norwegian/utf8-doc.tex
++
++EXTRA_DIST += \
++	norwegian/utf8.pl.in
++
++dist_noinst_DATA += \
++	norwegian/latin1.pl
++
++CLEANFILES += \
++	norwegian/utf8.pl \
++	norwegian/utf8.raw \
++	norwegian/latin1.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/polish/Makefile.am xindy/make-rules/alphabets/polish/Makefile.am
+--- xindy.orig/make-rules/alphabets/polish/Makefile.am	2008-01-09 15:01:14.000000000 +0100
++++ xindy/make-rules/alphabets/polish/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for polish.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1250.raw \
+-	cp1250-doc.tex \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += polish
+ 
++nobase_nodist_lang_DATA += \
++	polish/utf8-lang.xdy \
++	polish/utf8-test.xdy \
++	polish/utf8.xdy \
++	polish/cp1250-lang.xdy \
++	polish/cp1250-test.xdy \
++	polish/cp1250.xdy \
++	polish/latin2-lang.xdy \
++	polish/latin2-test.xdy \
++	polish/latin2.xdy
++
++DOCS_CP1250 += \
++	polish/cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	polish/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	polish/utf8-doc.tex
++
++EXTRA_DIST += \
++	polish/utf8.pl.in
++
++dist_noinst_DATA += \
++	polish/cp1250.pl \
++	polish/latin2.pl
++
++CLEANFILES += \
++	polish/utf8.pl \
++	polish/utf8.raw \
++	polish/cp1250.raw \
++	polish/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/portuguese/Makefile.am xindy/make-rules/alphabets/portuguese/Makefile.am
+--- xindy.orig/make-rules/alphabets/portuguese/Makefile.am	2008-01-09 15:01:14.000000000 +0100
++++ xindy/make-rules/alphabets/portuguese/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for portuguese.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,30 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin1.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin1.raw \
+-	latin1-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += portuguese
+ 
++nobase_nodist_lang_DATA += \
++	portuguese/utf8-lang.xdy \
++	portuguese/utf8-test.xdy \
++	portuguese/utf8.xdy \
++	portuguese/latin1-lang.xdy \
++	portuguese/latin1-test.xdy \
++	portuguese/latin1.xdy
++
++DOCS_LATIN1 += \
++	portuguese/latin1-doc.tex
++
++DOCS_UTF8_LAT += \
++	portuguese/utf8-doc.tex
++
++EXTRA_DIST += \
++	portuguese/utf8.pl.in
++
++dist_noinst_DATA += \
++	portuguese/latin1.pl
++
++CLEANFILES += \
++	portuguese/utf8.pl \
++	portuguese/utf8.raw \
++	portuguese/latin1.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/romanian/Makefile.am xindy/make-rules/alphabets/romanian/Makefile.am
+--- xindy.orig/make-rules/alphabets/romanian/Makefile.am	2008-01-09 15:01:14.000000000 +0100
++++ xindy/make-rules/alphabets/romanian/Makefile.am	2010-01-13 13:52:01.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for romanian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,14 +18,35 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += romanian
+ 
++nobase_nodist_lang_DATA += \
++	romanian/utf8-lang.xdy \
++	romanian/utf8-test.xdy \
++	romanian/utf8.xdy \
++	romanian/latin2-lang.xdy \
++	romanian/latin2-test.xdy \
++	romanian/latin2.xdy
++
++DOCS_LATIN2 += \
++	romanian/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	romanian/utf8-doc.tex
++
++romanian/latin2.pl : romanian/utf8.pl.in
++	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
++	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
++
++EXTRA_DIST += \
++	rom-comma-kludge.sed \
++	romanian/utf8.pl.in
++
++dist_noinst_DATA += \
++	romanian/latin2.pl
++
++CLEANFILES += \
++	romanian/utf8.pl \
++	romanian/utf8.raw \
++	romanian/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/russian/Makefile.am xindy/make-rules/alphabets/russian/Makefile.am
+--- xindy.orig/make-rules/alphabets/russian/Makefile.am	2008-01-09 15:01:13.000000000 +0100
++++ xindy/make-rules/alphabets/russian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for russian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,22 +18,55 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-    cp1251.pl iso88595.pl koi8-r.pl translit-iso-utf8.pl.in utf8.pl.in \
+-    translit-iso-tex.xdy translit-tex.xdy translit-tgl-tex.xdy
+-
+-CLEANFILES = \
+-	cp1251.raw \
+-	cp1251-doc.tex \
+-	iso88595.raw \
+-	iso88595-doc.tex \
+-	koi8-r.raw \
+-	koi8-r-doc.tex \
+-	translit-iso-utf8.raw \
+-	translit-iso-utf8-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += russian
+ 
++nobase_nodist_lang_DATA += \
++	russian/utf8-lang.xdy \
++	russian/utf8-test.xdy \
++	russian/utf8.xdy \
++	russian/iso88595-lang.xdy \
++	russian/iso88595-test.xdy \
++	russian/iso88595.xdy \
++	russian/koi8-r-lang.xdy \
++	russian/koi8-r-test.xdy \
++	russian/koi8-r.xdy \
++	russian/cp1251-lang.xdy \
++	russian/cp1251-test.xdy \
++	russian/cp1251.xdy \
++	russian/translit-iso-utf8-lang.xdy \
++	russian/translit-iso-utf8-test.xdy \
++	russian/translit-iso-utf8.xdy
++
++DOCS_CYR_1251 += \
++	russian/cp1251-doc.tex
++
++DOCS_CYR_ISO88595 += \
++	russian/iso88595-doc.tex
++
++DOCS_CYR_KOI8_R += \
++	russian/koi8-r-doc.tex
++
++DOCS_UTF8_LAT += \
++	russian/translit-iso-utf8-doc.tex
++
++DOCS_UTF8_CYR += \
++	russian/utf8-doc.tex
++
++EXTRA_DIST += \
++	russian/utf8.pl.in \
++	russian/translit-iso-utf8.pl.in
++
++dist_noinst_DATA += \
++	russian/iso88595.pl \
++	russian/koi8-r.pl \
++	russian/cp1251.pl
++
++CLEANFILES += \
++	russian/utf8.pl \
++	russian/utf8.raw \
++	russian/iso88595.raw \
++	russian/koi8-r.raw \
++	russian/cp1251.raw \
++	russian/translit-iso-utf8.pl \
++	russian/translit-iso-utf8.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/serbian/Makefile.am xindy/make-rules/alphabets/serbian/Makefile.am
+--- xindy.orig/make-rules/alphabets/serbian/Makefile.am	2008-01-09 15:01:13.000000000 +0100
++++ xindy/make-rules/alphabets/serbian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for serbian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,18 +18,46 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1251.pl iso88595.pl isoir111.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1251.raw \
+-	cp1251-doc.tex \
+-	iso88595.raw \
+-	iso88595-doc.tex \
+-	isoir111.raw \
+-	isoir111-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += serbian
+ 
++nobase_nodist_lang_DATA += \
++	serbian/utf8-lang.xdy \
++	serbian/utf8-test.xdy \
++	serbian/utf8.xdy \
++	serbian/iso88595-lang.xdy \
++	serbian/iso88595-test.xdy \
++	serbian/iso88595.xdy \
++	serbian/isoir111-lang.xdy \
++	serbian/isoir111-test.xdy \
++	serbian/isoir111.xdy \
++	serbian/cp1251-lang.xdy \
++	serbian/cp1251-test.xdy \
++	serbian/cp1251.xdy
++
++DOCS_CYR_1251 += \
++	serbian/cp1251-doc.tex
++
++DOCS_CYR_ISO88595 += \
++	serbian/iso88595-doc.tex
++
++DOCS_CYR_ISOIR111 += \
++	serbian/isoir111-doc.tex
++
++DOCS_UTF8_CYR += \
++	serbian/utf8-doc.tex
++
++EXTRA_DIST += \
++	serbian/utf8.pl.in
++
++dist_noinst_DATA += \
++	serbian/iso88595.pl \
++	serbian/isoir111.pl \
++	serbian/cp1251.pl
++
++CLEANFILES += \
++	serbian/utf8.pl \
++	serbian/utf8.raw \
++	serbian/iso88595.raw \
++	serbian/isoir111.raw \
++	serbian/cp1251.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/slovak/Makefile.am xindy/make-rules/alphabets/slovak/Makefile.am
+--- xindy.orig/make-rules/alphabets/slovak/Makefile.am	2008-01-09 15:01:12.000000000 +0100
++++ xindy/make-rules/alphabets/slovak/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for slovak.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,24 +18,57 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-    large-cp1250.pl large-latin2.pl large-utf8.pl.in \
+-    small-cp1250.pl small-latin2.pl small-utf8.pl.in
+-
+-CLEANFILES = \
+-	large-cp1250.raw \
+-	large-cp1250-doc.tex \
+-	large-latin2.raw \
+-	large-latin2-doc.tex \
+-	large-utf8.raw \
+-	large-utf8-doc.tex \
+-	small-cp1250.raw \
+-	small-cp1250-doc.tex \
+-	small-latin2.raw \
+-	small-latin2-doc.tex \
+-	small-utf8.raw \
+-	small-utf8-doc.tex
+-
+-
++subdirs += slovak
+ 
++nobase_nodist_lang_DATA += \
++	slovak/large-utf8-lang.xdy \
++	slovak/large-utf8-test.xdy \
++	slovak/large-utf8.xdy \
++	slovak/large-cp1250-lang.xdy \
++	slovak/large-cp1250-test.xdy \
++	slovak/large-cp1250.xdy \
++	slovak/large-latin2-lang.xdy \
++	slovak/large-latin2-test.xdy \
++	slovak/large-latin2.xdy \
++	slovak/small-utf8-lang.xdy \
++	slovak/small-utf8-test.xdy \
++	slovak/small-utf8.xdy \
++	slovak/small-cp1250-lang.xdy \
++	slovak/small-cp1250-test.xdy \
++	slovak/small-cp1250.xdy \
++	slovak/small-latin2-lang.xdy \
++	slovak/small-latin2-test.xdy \
++	slovak/small-latin2.xdy
++
++DOCS_CP1250 += \
++	slovak/large-cp1250-doc.tex \
++	slovak/small-cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	slovak/large-latin2-doc.tex \
++	slovak/small-latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	slovak/large-utf8-doc.tex \
++	slovak/small-utf8-doc.tex
++
++EXTRA_DIST += \
++	slovak/large-utf8.pl.in \
++	slovak/small-utf8.pl.in
++
++dist_noinst_DATA += \
++	slovak/large-cp1250.pl \
++	slovak/large-latin2.pl \
++	slovak/small-cp1250.pl \
++	slovak/small-latin2.pl
++
++CLEANFILES += \
++	slovak/large-utf8.pl \
++	slovak/large-utf8.raw \
++	slovak/large-cp1250.raw \
++	slovak/large-latin2.raw \
++	slovak/small-utf8.pl \
++	slovak/small-utf8.raw \
++	slovak/small-cp1250.raw \
++	slovak/small-latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/slovenian/Makefile.am xindy/make-rules/alphabets/slovenian/Makefile.am
+--- xindy.orig/make-rules/alphabets/slovenian/Makefile.am	2008-01-09 15:01:12.000000000 +0100
++++ xindy/make-rules/alphabets/slovenian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for slovenian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1250.raw \
+-	cp1250-doc.tex \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += slovenian
+ 
++nobase_nodist_lang_DATA += \
++	slovenian/utf8-lang.xdy \
++	slovenian/utf8-test.xdy \
++	slovenian/utf8.xdy \
++	slovenian/cp1250-lang.xdy \
++	slovenian/cp1250-test.xdy \
++	slovenian/cp1250.xdy \
++	slovenian/latin2-lang.xdy \
++	slovenian/latin2-test.xdy \
++	slovenian/latin2.xdy
++
++DOCS_CP1250 += \
++	slovenian/cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	slovenian/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	slovenian/utf8-doc.tex
++
++EXTRA_DIST += \
++	slovenian/utf8.pl.in
++
++dist_noinst_DATA += \
++	slovenian/cp1250.pl \
++	slovenian/latin2.pl
++
++CLEANFILES += \
++	slovenian/utf8.pl \
++	slovenian/utf8.raw \
++	slovenian/cp1250.raw \
++	slovenian/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/spanish/Makefile.am xindy/make-rules/alphabets/spanish/Makefile.am
+--- xindy.orig/make-rules/alphabets/spanish/Makefile.am	2008-01-09 15:01:11.000000000 +0100
++++ xindy/make-rules/alphabets/spanish/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for spanish.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,20 +18,43 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-    modern-latin1.pl modern-utf8.pl.in \
+-    traditional-latin1.pl traditional-utf8.pl.in
+-
+-CLEANFILES = \
+-	modern-latin1.raw \
+-	modern-latin1-doc.tex \
+-	modern-utf8.raw \
+-	modern-utf8-doc.tex \
+-	traditional-latin1.raw \
+-	traditional-latin1-doc.tex \
+-	traditional-utf8.raw \
+-	traditional-utf8-doc.tex
+-
+-
++subdirs += spanish
+ 
++nobase_nodist_lang_DATA += \
++	spanish/modern-utf8-lang.xdy \
++	spanish/modern-utf8-test.xdy \
++	spanish/modern-utf8.xdy \
++	spanish/modern-latin1-lang.xdy \
++	spanish/modern-latin1-test.xdy \
++	spanish/modern-latin1.xdy \
++	spanish/traditional-utf8-lang.xdy \
++	spanish/traditional-utf8-test.xdy \
++	spanish/traditional-utf8.xdy \
++	spanish/traditional-latin1-lang.xdy \
++	spanish/traditional-latin1-test.xdy \
++	spanish/traditional-latin1.xdy
++
++DOCS_LATIN1 += \
++	spanish/modern-latin1-doc.tex \
++	spanish/traditional-latin1-doc.tex
++
++DOCS_UTF8_LAT += \
++	spanish/modern-utf8-doc.tex \
++	spanish/traditional-utf8-doc.tex
++
++EXTRA_DIST += \
++	spanish/modern-utf8.pl.in \
++	spanish/traditional-utf8.pl.in
++
++dist_noinst_DATA += \
++	spanish/modern-latin1.pl \
++	spanish/traditional-latin1.pl
++
++CLEANFILES += \
++	spanish/modern-utf8.pl \
++	spanish/modern-utf8.raw \
++	spanish/modern-latin1.raw \
++	spanish/traditional-utf8.pl \
++	spanish/traditional-utf8.raw \
++	spanish/traditional-latin1.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/swedish/Makefile.am xindy/make-rules/alphabets/swedish/Makefile.am
+--- xindy.orig/make-rules/alphabets/swedish/Makefile.am	2008-01-09 15:01:11.000000000 +0100
++++ xindy/make-rules/alphabets/swedish/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for swedish.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,18 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = \
+-    cp1252.pl latin9.pl utf8.pl.in \
+-    latin1.xdy
+-
+-CLEANFILES = \
+-	cp1252.raw \
+-	cp1252-doc.tex \
+-	latin9.raw \
+-	latin9-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += swedish
+ 
++nobase_nodist_lang_DATA += \
++	swedish/utf8-lang.xdy \
++	swedish/utf8-test.xdy \
++	swedish/utf8.xdy \
++	swedish/cp1252-lang.xdy \
++	swedish/cp1252-test.xdy \
++	swedish/cp1252.xdy \
++	swedish/latin9-lang.xdy \
++	swedish/latin9-test.xdy \
++	swedish/latin9.xdy
++
++DOCS_CP1252 += \
++	swedish/cp1252-doc.tex
++
++DOCS_LATIN9 += \
++	swedish/latin9-doc.tex
++
++DOCS_UTF8_LAT += \
++	swedish/utf8-doc.tex
++
++EXTRA_DIST += \
++	swedish/utf8.pl.in
++
++dist_noinst_DATA += \
++	swedish/cp1252.pl \
++	swedish/latin9.pl
++
++CLEANFILES += \
++	swedish/utf8.pl \
++	swedish/utf8.raw \
++	swedish/cp1252.raw \
++	swedish/latin9.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/test1/Makefile.am xindy/make-rules/alphabets/test1/Makefile.am
+--- xindy.orig/make-rules/alphabets/test1/Makefile.am	2008-01-09 15:01:11.000000000 +0100
++++ xindy/make-rules/alphabets/test1/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for test1.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,10 +18,8 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = test1.pl
+-
+-
+-
+-
++subdirs += test1
+ 
++dist_noinst_DATA += \
++	test1/test1.pl
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/turkish/Makefile.am xindy/make-rules/alphabets/turkish/Makefile.am
+--- xindy.orig/make-rules/alphabets/turkish/Makefile.am	2008-01-09 15:01:10.000000000 +0100
++++ xindy/make-rules/alphabets/turkish/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for turkish.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = latin3.pl latin5.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	latin3.raw \
+-	latin3-doc.tex \
+-	latin5.raw \
+-	latin5-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += turkish
+ 
++nobase_nodist_lang_DATA += \
++	turkish/utf8-lang.xdy \
++	turkish/utf8-test.xdy \
++	turkish/utf8.xdy \
++	turkish/latin3-lang.xdy \
++	turkish/latin3-test.xdy \
++	turkish/latin3.xdy \
++	turkish/latin5-lang.xdy \
++	turkish/latin5-test.xdy \
++	turkish/latin5.xdy
++
++DOCS_LATIN3 += \
++	turkish/latin3-doc.tex
++
++DOCS_LATIN5 += \
++	turkish/latin5-doc.tex
++
++DOCS_UTF8_LAT += \
++	turkish/utf8-doc.tex
++
++EXTRA_DIST += \
++	turkish/utf8.pl.in
++
++dist_noinst_DATA += \
++	turkish/latin3.pl \
++	turkish/latin5.pl
++
++CLEANFILES += \
++	turkish/utf8.pl \
++	turkish/utf8.raw \
++	turkish/latin3.raw \
++	turkish/latin5.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/ukrainian/Makefile.am xindy/make-rules/alphabets/ukrainian/Makefile.am
+--- xindy.orig/make-rules/alphabets/ukrainian/Makefile.am	2008-01-09 15:01:10.000000000 +0100
++++ xindy/make-rules/alphabets/ukrainian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for ukrainian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1251.pl koi8-u.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1251.raw \
+-	cp1251-doc.tex \
+-	koi8-u.raw \
+-	koi8-u-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += ukrainian
+ 
++nobase_nodist_lang_DATA += \
++	ukrainian/utf8-lang.xdy \
++	ukrainian/utf8-test.xdy \
++	ukrainian/utf8.xdy \
++	ukrainian/koi8-u-lang.xdy \
++	ukrainian/koi8-u-test.xdy \
++	ukrainian/koi8-u.xdy \
++	ukrainian/cp1251-lang.xdy \
++	ukrainian/cp1251-test.xdy \
++	ukrainian/cp1251.xdy
++
++DOCS_CYR_1251 += \
++	ukrainian/cp1251-doc.tex
++
++DOCS_CYR_KOI8_U += \
++	ukrainian/koi8-u-doc.tex
++
++DOCS_UTF8_CYR += \
++	ukrainian/utf8-doc.tex
++
++EXTRA_DIST += \
++	ukrainian/utf8.pl.in
++
++dist_noinst_DATA += \
++	ukrainian/koi8-u.pl \
++	ukrainian/cp1251.pl
++
++CLEANFILES += \
++	ukrainian/utf8.pl \
++	ukrainian/utf8.raw \
++	ukrainian/koi8-u.raw \
++	ukrainian/cp1251.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/upper-sorbian/Makefile.am xindy/make-rules/alphabets/upper-sorbian/Makefile.am
+--- xindy.orig/make-rules/alphabets/upper-sorbian/Makefile.am	2008-01-09 15:01:09.000000000 +0100
++++ xindy/make-rules/alphabets/upper-sorbian/Makefile.am	2010-01-13 13:01:56.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for upper-sorbian.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,16 +18,38 @@
+ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ## Boston, MA 02110-1301 USA.
+ 
+-EXTRA_DIST = cp1250.pl latin2.pl utf8.pl.in
+-
+-CLEANFILES = \
+-	cp1250.raw \
+-	cp1250-doc.tex \
+-	latin2.raw \
+-	latin2-doc.tex \
+-	utf8.raw \
+-	utf8-doc.tex
+-
+-
++subdirs += upper-sorbian
+ 
++nobase_nodist_lang_DATA += \
++	upper-sorbian/utf8-lang.xdy \
++	upper-sorbian/utf8-test.xdy \
++	upper-sorbian/utf8.xdy \
++	upper-sorbian/cp1250-lang.xdy \
++	upper-sorbian/cp1250-test.xdy \
++	upper-sorbian/cp1250.xdy \
++	upper-sorbian/latin2-lang.xdy \
++	upper-sorbian/latin2-test.xdy \
++	upper-sorbian/latin2.xdy
++
++DOCS_CP1250 += \
++	upper-sorbian/cp1250-doc.tex
++
++DOCS_LATIN2 += \
++	upper-sorbian/latin2-doc.tex
++
++DOCS_UTF8_LAT += \
++	upper-sorbian/utf8-doc.tex
++
++EXTRA_DIST += \
++	upper-sorbian/utf8.pl.in
++
++dist_noinst_DATA += \
++	upper-sorbian/cp1250.pl \
++	upper-sorbian/latin2.pl
++
++CLEANFILES += \
++	upper-sorbian/utf8.pl \
++	upper-sorbian/utf8.raw \
++	upper-sorbian/cp1250.raw \
++	upper-sorbian/latin2.raw
+ 
+diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/vietnamese/Makefile.am xindy/make-rules/alphabets/vietnamese/Makefile.am
+--- xindy.orig/make-rules/alphabets/vietnamese/Makefile.am	2008-01-09 15:01:05.000000000 +0100
++++ xindy/make-rules/alphabets/vietnamese/Makefile.am	2010-01-13 11:41:18.000000000 +0100
+@@ -1,7 +1,6 @@
+-## Use `autoreconf' in top-level directory to recreate all
+-## autoconf/automake files.
+-## Or, call `automake Makefile' to create only Makefile.in.
++## Makefile fragment for vietnamese.
+ 
++## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -19,12 +18,20 @@
+ ## 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
+-
+-
++subdirs += vietnamese
+ 
++nobase_nodist_lang_DATA += \
++	vietnamese/utf8-lang.xdy \
++	vietnamese/utf8-test.xdy \
++	vietnamese/utf8.xdy
++
++DOCS_UTF8_LAT += \
++	vietnamese/utf8-doc.tex
++
++EXTRA_DIST += \
++	vietnamese/utf8.pl.in
++
++CLEANFILES += \
++	vietnamese/utf8.pl \
++	vietnamese/utf8.raw
+ 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
index 17e00b23109..a74be92ab9a 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.am
@@ -22,6 +22,7 @@
 langdir	= $(pkglibdir)/modules/lang
 
 nobase_nodist_lang_DATA =
+dist_noinst_DATA =
 
 DOCS_CP1250 =
 DOCS_CP1252 =
@@ -46,7 +47,7 @@ DOCS_UTF8_LAT =
 DOCS_UTF8_CYR =
 DOCS_UTF8_OTHER =
 
-EXTRA_DIST =
+EXTRA_DIST = mk-lang.sh lang.defs
 CLEANFILES =
 
 subdirs =
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
index 4adfb959d33..4306f00ae76 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/Makefile.in
@@ -33,8 +33,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/albanian/Makefile.am \
+DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/albanian/Makefile.am \
 	$(srcdir)/belarusian/Makefile.am \
 	$(srcdir)/bulgarian/Makefile.am $(srcdir)/croatian/Makefile.am \
 	$(srcdir)/czech/Makefile.am $(srcdir)/danish/Makefile.am \
@@ -95,7 +95,7 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(langdir)"
-DATA = $(doc_DATA) $(nobase_nodist_lang_DATA)
+DATA = $(dist_noinst_DATA) $(doc_DATA) $(nobase_nodist_lang_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkglibdir = @pkglibdir@
 ACLOCAL = @ACLOCAL@
@@ -204,187 +204,218 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 langdir = $(pkglibdir)/modules/lang
-nobase_nodist_lang_DATA = albanian/latin1-lang.xdy \
-	albanian/latin1-test.xdy albanian/latin1.xdy \
-	albanian/utf8-lang.xdy albanian/utf8-test.xdy \
-	albanian/utf8.xdy belarusian/cp1251-lang.xdy \
-	belarusian/cp1251-test.xdy belarusian/cp1251.xdy \
+nobase_nodist_lang_DATA = albanian/utf8-lang.xdy \
+	albanian/utf8-test.xdy albanian/utf8.xdy \
+	albanian/latin1-lang.xdy albanian/latin1-test.xdy \
+	albanian/latin1.xdy belarusian/utf8-lang.xdy \
+	belarusian/utf8-test.xdy belarusian/utf8.xdy \
 	belarusian/iso88595-lang.xdy belarusian/iso88595-test.xdy \
 	belarusian/iso88595.xdy belarusian/isoir111-lang.xdy \
 	belarusian/isoir111-test.xdy belarusian/isoir111.xdy \
-	belarusian/utf8-lang.xdy belarusian/utf8-test.xdy \
-	belarusian/utf8.xdy bulgarian/cp1251-lang.xdy \
-	bulgarian/cp1251-test.xdy bulgarian/cp1251.xdy \
+	belarusian/cp1251-lang.xdy belarusian/cp1251-test.xdy \
+	belarusian/cp1251.xdy bulgarian/utf8-lang.xdy \
+	bulgarian/utf8-test.xdy bulgarian/utf8.xdy \
 	bulgarian/iso88595-lang.xdy bulgarian/iso88595-test.xdy \
 	bulgarian/iso88595.xdy bulgarian/koi8-r-lang.xdy \
 	bulgarian/koi8-r-test.xdy bulgarian/koi8-r.xdy \
-	bulgarian/utf8-lang.xdy bulgarian/utf8-test.xdy \
-	bulgarian/utf8.xdy croatian/cp1250-lang.xdy \
-	croatian/cp1250-test.xdy croatian/cp1250.xdy \
-	croatian/latin2-lang.xdy croatian/latin2-test.xdy \
-	croatian/latin2.xdy croatian/utf8-lang.xdy \
-	croatian/utf8-test.xdy croatian/utf8.xdy czech/cp1250-lang.xdy \
-	czech/cp1250-test.xdy czech/cp1250.xdy czech/latin2-lang.xdy \
-	czech/latin2-test.xdy czech/latin2.xdy czech/utf8-lang.xdy \
-	czech/utf8-test.xdy czech/utf8.xdy danish/cp1252-lang.xdy \
-	danish/cp1252-test.xdy danish/cp1252.xdy \
-	danish/latin9-lang.xdy danish/latin9-test.xdy \
-	danish/latin9.xdy danish/utf8-lang.xdy danish/utf8-test.xdy \
-	danish/utf8.xdy dutch/ij-as-ij-latin1-lang.xdy \
-	dutch/ij-as-ij-latin1-test.xdy dutch/ij-as-ij-latin1.xdy \
+	bulgarian/cp1251-lang.xdy bulgarian/cp1251-test.xdy \
+	bulgarian/cp1251.xdy croatian/utf8-lang.xdy \
+	croatian/utf8-test.xdy croatian/utf8.xdy \
+	croatian/cp1250-lang.xdy croatian/cp1250-test.xdy \
+	croatian/cp1250.xdy croatian/latin2-lang.xdy \
+	croatian/latin2-test.xdy croatian/latin2.xdy \
+	czech/utf8-lang.xdy czech/utf8-test.xdy czech/utf8.xdy \
+	czech/cp1250-lang.xdy czech/cp1250-test.xdy czech/cp1250.xdy \
+	czech/latin2-lang.xdy czech/latin2-test.xdy czech/latin2.xdy \
+	danish/utf8-lang.xdy danish/utf8-test.xdy danish/utf8.xdy \
+	danish/cp1252-lang.xdy danish/cp1252-test.xdy \
+	danish/cp1252.xdy danish/latin9-lang.xdy \
+	danish/latin9-test.xdy danish/latin9.xdy \
 	dutch/ij-as-ij-utf8-lang.xdy dutch/ij-as-ij-utf8-test.xdy \
-	dutch/ij-as-ij-utf8.xdy dutch/ij-as-y-utf8-lang.xdy \
-	dutch/ij-as-y-utf8-test.xdy dutch/ij-as-y-utf8.xdy \
-	english/cp1252-lang.xdy english/cp1252-test.xdy \
-	english/cp1252.xdy english/latin9-lang.xdy \
-	english/latin9-test.xdy english/latin9.xdy \
-	english/utf8-lang.xdy english/utf8-test.xdy english/utf8.xdy \
-	esperanto/latin3-lang.xdy esperanto/latin3-test.xdy \
-	esperanto/latin3.xdy esperanto/utf8-lang.xdy \
+	dutch/ij-as-ij-utf8.xdy dutch/ij-as-ij-latin1-lang.xdy \
+	dutch/ij-as-ij-latin1-test.xdy dutch/ij-as-ij-latin1.xdy \
+	dutch/ij-as-y-utf8-lang.xdy dutch/ij-as-y-utf8-test.xdy \
+	dutch/ij-as-y-utf8.xdy english/utf8-lang.xdy \
+	english/utf8-test.xdy english/utf8.xdy english/cp1252-lang.xdy \
+	english/cp1252-test.xdy english/cp1252.xdy \
+	english/latin9-lang.xdy english/latin9-test.xdy \
+	english/latin9.xdy esperanto/utf8-lang.xdy \
 	esperanto/utf8-test.xdy esperanto/utf8.xdy \
+	esperanto/latin3-lang.xdy esperanto/latin3-test.xdy \
+	esperanto/latin3.xdy estonian/utf8-lang.xdy \
+	estonian/utf8-test.xdy estonian/utf8.xdy \
 	estonian/cp1252-lang.xdy estonian/cp1252-test.xdy \
 	estonian/cp1252.xdy estonian/latin9-lang.xdy \
 	estonian/latin9-test.xdy estonian/latin9.xdy \
-	estonian/utf8-lang.xdy estonian/utf8-test.xdy \
-	estonian/utf8.xdy finnish/cp1252-lang.xdy \
-	finnish/cp1252-test.xdy finnish/cp1252.xdy \
-	finnish/latin9-lang.xdy finnish/latin9-test.xdy \
-	finnish/latin9.xdy finnish/utf8-lang.xdy finnish/utf8-test.xdy \
-	finnish/utf8.xdy french/cp1252-lang.xdy french/cp1252-test.xdy \
+	finnish/utf8-lang.xdy finnish/utf8-test.xdy finnish/utf8.xdy \
+	finnish/cp1252-lang.xdy finnish/cp1252-test.xdy \
+	finnish/cp1252.xdy finnish/latin9-lang.xdy \
+	finnish/latin9-test.xdy finnish/latin9.xdy \
+	french/utf8-lang.xdy french/utf8-test.xdy french/utf8.xdy \
+	french/cp1252-lang.xdy french/cp1252-test.xdy \
 	french/cp1252.xdy french/latin9-lang.xdy \
-	french/latin9-test.xdy french/latin9.xdy french/utf8-lang.xdy \
-	french/utf8-test.xdy french/utf8.xdy general/cp1252-lang.xdy \
+	french/latin9-test.xdy french/latin9.xdy general/utf8-lang.xdy \
+	general/utf8-test.xdy general/utf8.xdy general/cp1252-lang.xdy \
 	general/cp1252-test.xdy general/cp1252.xdy \
 	general/cp850-lang.xdy general/cp850-test.xdy \
 	general/cp850.xdy general/latin9-lang.xdy \
 	general/latin9-test.xdy general/latin9.xdy \
-	general/utf8-lang.xdy general/utf8-test.xdy general/utf8.xdy \
 	georgian/utf8-lang.xdy georgian/utf8-test.xdy \
 	georgian/utf8.xdy german/braille-utf8-lang.xdy \
 	german/braille-utf8-test.xdy german/braille-utf8.xdy \
-	german/din5007-latin1-lang.xdy german/din5007-latin1-test.xdy \
-	german/din5007-latin1.xdy german/din5007-utf8-lang.xdy \
-	german/din5007-utf8-test.xdy german/din5007-utf8.xdy \
-	german/duden-latin1-lang.xdy german/duden-latin1-test.xdy \
-	german/duden-latin1.xdy german/duden-utf8-lang.xdy \
-	german/duden-utf8-test.xdy german/duden-utf8.xdy \
+	german/din5007-utf8-lang.xdy german/din5007-utf8-test.xdy \
+	german/din5007-utf8.xdy german/din5007-latin1-lang.xdy \
+	german/din5007-latin1-test.xdy german/din5007-latin1.xdy \
+	german/duden-utf8-lang.xdy german/duden-utf8-test.xdy \
+	german/duden-utf8.xdy german/duden-latin1-lang.xdy \
+	german/duden-latin1-test.xdy german/duden-latin1.xdy \
+	greek/utf8-lang.xdy greek/utf8-test.xdy greek/utf8.xdy \
 	greek/iso88597-lang.xdy greek/iso88597-test.xdy \
 	greek/iso88597.xdy greek/polytonic-utf8-lang.xdy \
 	greek/polytonic-utf8-test.xdy greek/polytonic-utf8.xdy \
-	greek/translit-latin4-lang.xdy greek/translit-latin4-test.xdy \
-	greek/translit-latin4.xdy greek/translit-utf8-lang.xdy \
-	greek/translit-utf8-test.xdy greek/translit-utf8.xdy \
-	greek/utf8-lang.xdy greek/utf8-test.xdy greek/utf8.xdy \
+	greek/translit-utf8-lang.xdy greek/translit-utf8-test.xdy \
+	greek/translit-utf8.xdy greek/translit-latin4-lang.xdy \
+	greek/translit-latin4-test.xdy greek/translit-latin4.xdy \
 	gypsy/northrussian-utf8-lang.xdy \
 	gypsy/northrussian-utf8-test.xdy gypsy/northrussian-utf8.xdy \
 	hausa/utf8-lang.xdy hausa/utf8-test.xdy hausa/utf8.xdy \
+	hebrew/utf8-lang.xdy hebrew/utf8-test.xdy hebrew/utf8.xdy \
 	hebrew/iso88598-lang.xdy hebrew/iso88598-test.xdy \
-	hebrew/iso88598.xdy hebrew/utf8-lang.xdy hebrew/utf8-test.xdy \
-	hebrew/utf8.xdy hungarian/cp1250-lang.xdy \
-	hungarian/cp1250-test.xdy hungarian/cp1250.xdy \
-	hungarian/latin2-lang.xdy hungarian/latin2-test.xdy \
-	hungarian/latin2.xdy hungarian/utf8-lang.xdy \
+	hebrew/iso88598.xdy hungarian/utf8-lang.xdy \
 	hungarian/utf8-test.xdy hungarian/utf8.xdy \
-	icelandic/cp1252-lang.xdy icelandic/cp1252-test.xdy \
-	icelandic/cp1252.xdy icelandic/latin9-lang.xdy \
-	icelandic/latin9-test.xdy icelandic/latin9.xdy \
+	hungarian/cp1250-lang.xdy hungarian/cp1250-test.xdy \
+	hungarian/cp1250.xdy hungarian/latin2-lang.xdy \
+	hungarian/latin2-test.xdy hungarian/latin2.xdy \
 	icelandic/utf8-lang.xdy icelandic/utf8-test.xdy \
-	icelandic/utf8.xdy italian/latin1-lang.xdy \
+	icelandic/utf8.xdy icelandic/cp1252-lang.xdy \
+	icelandic/cp1252-test.xdy icelandic/cp1252.xdy \
+	icelandic/latin9-lang.xdy icelandic/latin9-test.xdy \
+	icelandic/latin9.xdy italian/utf8-lang.xdy \
+	italian/utf8-test.xdy italian/utf8.xdy italian/latin1-lang.xdy \
 	italian/latin1-test.xdy italian/latin1.xdy \
-	italian/utf8-lang.xdy italian/utf8-test.xdy italian/utf8.xdy \
 	klingon/utf8-lang.xdy klingon/utf8-test.xdy klingon/utf8.xdy \
-	kurdish/bedirxan-latin5-lang.xdy \
-	kurdish/bedirxan-latin5-test.xdy kurdish/bedirxan-latin5.xdy \
 	kurdish/bedirxan-utf8-lang.xdy kurdish/bedirxan-utf8-test.xdy \
-	kurdish/bedirxan-utf8.xdy kurdish/turkish-i-latin5-lang.xdy \
-	kurdish/turkish-i-latin5-test.xdy kurdish/turkish-i-latin5.xdy \
+	kurdish/bedirxan-utf8.xdy kurdish/bedirxan-latin5-lang.xdy \
+	kurdish/bedirxan-latin5-test.xdy kurdish/bedirxan-latin5.xdy \
 	kurdish/turkish-i-utf8-lang.xdy \
 	kurdish/turkish-i-utf8-test.xdy kurdish/turkish-i-utf8.xdy \
+	kurdish/turkish-i-latin5-lang.xdy \
+	kurdish/turkish-i-latin5-test.xdy kurdish/turkish-i-latin5.xdy \
 	latin/utf8-lang.xdy latin/utf8-test.xdy latin/utf8.xdy \
+	latvian/utf8-lang.xdy latvian/utf8-test.xdy latvian/utf8.xdy \
 	latvian/latin4-lang.xdy latvian/latin4-test.xdy \
-	latvian/latin4.xdy latvian/utf8-lang.xdy latvian/utf8-test.xdy \
-	latvian/utf8.xdy lithuanian/latin4-lang.xdy \
-	lithuanian/latin4-test.xdy lithuanian/latin4.xdy \
-	lithuanian/utf8-lang.xdy lithuanian/utf8-test.xdy \
-	lithuanian/utf8.xdy lower-sorbian/cp1250-lang.xdy \
-	lower-sorbian/cp1250-test.xdy lower-sorbian/cp1250.xdy \
-	lower-sorbian/latin2-lang.xdy lower-sorbian/latin2-test.xdy \
-	lower-sorbian/latin2.xdy lower-sorbian/utf8-lang.xdy \
+	latvian/latin4.xdy lithuanian/utf8-lang.xdy \
+	lithuanian/utf8-test.xdy lithuanian/utf8.xdy \
+	lithuanian/latin4-lang.xdy lithuanian/latin4-test.xdy \
+	lithuanian/latin4.xdy lower-sorbian/utf8-lang.xdy \
 	lower-sorbian/utf8-test.xdy lower-sorbian/utf8.xdy \
-	macedonian/cp1251-lang.xdy macedonian/cp1251-test.xdy \
-	macedonian/cp1251.xdy macedonian/iso88595-lang.xdy \
+	lower-sorbian/cp1250-lang.xdy lower-sorbian/cp1250-test.xdy \
+	lower-sorbian/cp1250.xdy lower-sorbian/latin2-lang.xdy \
+	lower-sorbian/latin2-test.xdy lower-sorbian/latin2.xdy \
+	macedonian/utf8-lang.xdy macedonian/utf8-test.xdy \
+	macedonian/utf8.xdy macedonian/iso88595-lang.xdy \
 	macedonian/iso88595-test.xdy macedonian/iso88595.xdy \
 	macedonian/isoir111-lang.xdy macedonian/isoir111-test.xdy \
-	macedonian/isoir111.xdy macedonian/utf8-lang.xdy \
-	macedonian/utf8-test.xdy macedonian/utf8.xdy \
+	macedonian/isoir111.xdy macedonian/cp1251-lang.xdy \
+	macedonian/cp1251-test.xdy macedonian/cp1251.xdy \
 	mongolian/cyrillic-utf8-lang.xdy \
 	mongolian/cyrillic-utf8-test.xdy mongolian/cyrillic-utf8.xdy \
-	norwegian/latin1-lang.xdy norwegian/latin1-test.xdy \
-	norwegian/latin1.xdy norwegian/utf8-lang.xdy \
-	norwegian/utf8-test.xdy norwegian/utf8.xdy \
+	norwegian/utf8-lang.xdy norwegian/utf8-test.xdy \
+	norwegian/utf8.xdy norwegian/latin1-lang.xdy \
+	norwegian/latin1-test.xdy norwegian/latin1.xdy \
+	polish/utf8-lang.xdy polish/utf8-test.xdy polish/utf8.xdy \
 	polish/cp1250-lang.xdy polish/cp1250-test.xdy \
 	polish/cp1250.xdy polish/latin2-lang.xdy \
-	polish/latin2-test.xdy polish/latin2.xdy polish/utf8-lang.xdy \
-	polish/utf8-test.xdy polish/utf8.xdy \
-	portuguese/latin1-lang.xdy portuguese/latin1-test.xdy \
-	portuguese/latin1.xdy portuguese/utf8-lang.xdy \
-	portuguese/utf8-test.xdy portuguese/utf8.xdy \
-	romanian/latin2-lang.xdy romanian/latin2-test.xdy \
-	romanian/latin2.xdy romanian/utf8-lang.xdy \
-	romanian/utf8-test.xdy romanian/utf8.xdy \
+	polish/latin2-test.xdy polish/latin2.xdy \
+	portuguese/utf8-lang.xdy portuguese/utf8-test.xdy \
+	portuguese/utf8.xdy portuguese/latin1-lang.xdy \
+	portuguese/latin1-test.xdy portuguese/latin1.xdy \
+	romanian/utf8-lang.xdy romanian/utf8-test.xdy \
+	romanian/utf8.xdy romanian/latin2-lang.xdy \
+	romanian/latin2-test.xdy romanian/latin2.xdy \
+	russian/utf8-lang.xdy russian/utf8-test.xdy russian/utf8.xdy \
+	russian/iso88595-lang.xdy russian/iso88595-test.xdy \
+	russian/iso88595.xdy russian/koi8-r-lang.xdy \
+	russian/koi8-r-test.xdy russian/koi8-r.xdy \
 	russian/cp1251-lang.xdy russian/cp1251-test.xdy \
-	russian/cp1251.xdy russian/iso88595-lang.xdy \
-	russian/iso88595-test.xdy russian/iso88595.xdy \
-	russian/koi8-r-lang.xdy russian/koi8-r-test.xdy \
-	russian/koi8-r.xdy russian/translit-iso-utf8-lang.xdy \
+	russian/cp1251.xdy russian/translit-iso-utf8-lang.xdy \
 	russian/translit-iso-utf8-test.xdy \
-	russian/translit-iso-utf8.xdy russian/utf8-lang.xdy \
-	russian/utf8-test.xdy russian/utf8.xdy serbian/cp1251-lang.xdy \
-	serbian/cp1251-test.xdy serbian/cp1251.xdy \
+	russian/translit-iso-utf8.xdy serbian/utf8-lang.xdy \
+	serbian/utf8-test.xdy serbian/utf8.xdy \
 	serbian/iso88595-lang.xdy serbian/iso88595-test.xdy \
 	serbian/iso88595.xdy serbian/isoir111-lang.xdy \
 	serbian/isoir111-test.xdy serbian/isoir111.xdy \
-	serbian/utf8-lang.xdy serbian/utf8-test.xdy serbian/utf8.xdy \
+	serbian/cp1251-lang.xdy serbian/cp1251-test.xdy \
+	serbian/cp1251.xdy slovak/large-utf8-lang.xdy \
+	slovak/large-utf8-test.xdy slovak/large-utf8.xdy \
 	slovak/large-cp1250-lang.xdy slovak/large-cp1250-test.xdy \
 	slovak/large-cp1250.xdy slovak/large-latin2-lang.xdy \
 	slovak/large-latin2-test.xdy slovak/large-latin2.xdy \
-	slovak/large-utf8-lang.xdy slovak/large-utf8-test.xdy \
-	slovak/large-utf8.xdy slovak/small-cp1250-lang.xdy \
+	slovak/small-utf8-lang.xdy slovak/small-utf8-test.xdy \
+	slovak/small-utf8.xdy slovak/small-cp1250-lang.xdy \
 	slovak/small-cp1250-test.xdy slovak/small-cp1250.xdy \
 	slovak/small-latin2-lang.xdy slovak/small-latin2-test.xdy \
-	slovak/small-latin2.xdy slovak/small-utf8-lang.xdy \
-	slovak/small-utf8-test.xdy slovak/small-utf8.xdy \
+	slovak/small-latin2.xdy slovenian/utf8-lang.xdy \
+	slovenian/utf8-test.xdy slovenian/utf8.xdy \
 	slovenian/cp1250-lang.xdy slovenian/cp1250-test.xdy \
 	slovenian/cp1250.xdy slovenian/latin2-lang.xdy \
 	slovenian/latin2-test.xdy slovenian/latin2.xdy \
-	slovenian/utf8-lang.xdy slovenian/utf8-test.xdy \
-	slovenian/utf8.xdy spanish/modern-latin1-lang.xdy \
-	spanish/modern-latin1-test.xdy spanish/modern-latin1.xdy \
 	spanish/modern-utf8-lang.xdy spanish/modern-utf8-test.xdy \
-	spanish/modern-utf8.xdy spanish/traditional-latin1-lang.xdy \
-	spanish/traditional-latin1-test.xdy \
-	spanish/traditional-latin1.xdy \
+	spanish/modern-utf8.xdy spanish/modern-latin1-lang.xdy \
+	spanish/modern-latin1-test.xdy spanish/modern-latin1.xdy \
 	spanish/traditional-utf8-lang.xdy \
 	spanish/traditional-utf8-test.xdy spanish/traditional-utf8.xdy \
-	swedish/cp1252-lang.xdy swedish/cp1252-test.xdy \
-	swedish/cp1252.xdy swedish/latin9-lang.xdy \
-	swedish/latin9-test.xdy swedish/latin9.xdy \
-	swedish/utf8-lang.xdy swedish/utf8-test.xdy swedish/utf8.xdy \
-	turkish/latin3-lang.xdy turkish/latin3-test.xdy \
-	turkish/latin3.xdy turkish/latin5-lang.xdy \
-	turkish/latin5-test.xdy turkish/latin5.xdy \
-	turkish/utf8-lang.xdy turkish/utf8-test.xdy turkish/utf8.xdy \
-	ukrainian/cp1251-lang.xdy ukrainian/cp1251-test.xdy \
-	ukrainian/cp1251.xdy ukrainian/koi8-u-lang.xdy \
-	ukrainian/koi8-u-test.xdy ukrainian/koi8-u.xdy \
-	ukrainian/utf8-lang.xdy ukrainian/utf8-test.xdy \
-	ukrainian/utf8.xdy upper-sorbian/cp1250-lang.xdy \
+	spanish/traditional-latin1-lang.xdy \
+	spanish/traditional-latin1-test.xdy \
+	spanish/traditional-latin1.xdy swedish/utf8-lang.xdy \
+	swedish/utf8-test.xdy swedish/utf8.xdy swedish/cp1252-lang.xdy \
+	swedish/cp1252-test.xdy swedish/cp1252.xdy \
+	swedish/latin9-lang.xdy swedish/latin9-test.xdy \
+	swedish/latin9.xdy turkish/utf8-lang.xdy turkish/utf8-test.xdy \
+	turkish/utf8.xdy turkish/latin3-lang.xdy \
+	turkish/latin3-test.xdy turkish/latin3.xdy \
+	turkish/latin5-lang.xdy turkish/latin5-test.xdy \
+	turkish/latin5.xdy ukrainian/utf8-lang.xdy \
+	ukrainian/utf8-test.xdy ukrainian/utf8.xdy \
+	ukrainian/koi8-u-lang.xdy ukrainian/koi8-u-test.xdy \
+	ukrainian/koi8-u.xdy ukrainian/cp1251-lang.xdy \
+	ukrainian/cp1251-test.xdy ukrainian/cp1251.xdy \
+	upper-sorbian/utf8-lang.xdy upper-sorbian/utf8-test.xdy \
+	upper-sorbian/utf8.xdy upper-sorbian/cp1250-lang.xdy \
 	upper-sorbian/cp1250-test.xdy upper-sorbian/cp1250.xdy \
 	upper-sorbian/latin2-lang.xdy upper-sorbian/latin2-test.xdy \
-	upper-sorbian/latin2.xdy upper-sorbian/utf8-lang.xdy \
-	upper-sorbian/utf8-test.xdy upper-sorbian/utf8.xdy \
-	vietnamese/utf8-lang.xdy vietnamese/utf8-test.xdy \
-	vietnamese/utf8.xdy
+	upper-sorbian/latin2.xdy vietnamese/utf8-lang.xdy \
+	vietnamese/utf8-test.xdy vietnamese/utf8.xdy
+dist_noinst_DATA = albanian/latin1.pl belarusian/iso88595.pl \
+	belarusian/isoir111.pl belarusian/cp1251.pl \
+	bulgarian/iso88595.pl bulgarian/koi8-r.pl bulgarian/cp1251.pl \
+	croatian/cp1250.pl croatian/latin2.pl czech/cp1250.pl \
+	czech/latin2.pl danish/cp1252.pl danish/latin9.pl \
+	dutch/ij-as-ij-latin1.pl english/cp1252.pl english/latin9.pl \
+	esperanto/latin3.pl estonian/cp1252.pl estonian/latin9.pl \
+	finnish/cp1252.pl finnish/latin9.pl french/cp1252.pl \
+	french/latin9.pl general/cp1252.pl general/cp850.pl \
+	general/latin9.pl general/template.pl german/din5007-latin1.pl \
+	german/duden-latin1.pl greek/iso88597.pl \
+	greek/translit-latin4.pl hebrew/iso88598.pl \
+	hungarian/cp1250.pl hungarian/latin2.pl icelandic/cp1252.pl \
+	icelandic/latin9.pl italian/latin1.pl \
+	klingon/translit-ascii.pl kurdish/bedirxan-latin5.pl \
+	kurdish/turkish-i-latin5.pl latvian/latin4.pl \
+	lithuanian/latin4.pl lower-sorbian/cp1250.pl \
+	lower-sorbian/latin2.pl macedonian/iso88595.pl \
+	macedonian/isoir111.pl macedonian/cp1251.pl \
+	norwegian/latin1.pl polish/cp1250.pl polish/latin2.pl \
+	portuguese/latin1.pl romanian/latin2.pl russian/iso88595.pl \
+	russian/koi8-r.pl russian/cp1251.pl serbian/iso88595.pl \
+	serbian/isoir111.pl serbian/cp1251.pl slovak/large-cp1250.pl \
+	slovak/large-latin2.pl slovak/small-cp1250.pl \
+	slovak/small-latin2.pl slovenian/cp1250.pl slovenian/latin2.pl \
+	spanish/modern-latin1.pl spanish/traditional-latin1.pl \
+	swedish/cp1252.pl swedish/latin9.pl test1/test1.pl \
+	turkish/latin3.pl turkish/latin5.pl ukrainian/koi8-u.pl \
+	ukrainian/cp1251.pl upper-sorbian/cp1250.pl \
+	upper-sorbian/latin2.pl
 DOCS_CP1250 = croatian/cp1250-doc.tex czech/cp1250-doc.tex \
 	hungarian/cp1250-doc.tex lower-sorbian/cp1250-doc.tex \
 	polish/cp1250-doc.tex slovak/large-cp1250-doc.tex \
@@ -403,7 +434,7 @@ DOCS_LATIN1 = albanian/latin1-doc.tex dutch/ij-as-ij-latin1-doc.tex \
 DOCS_LATIN2 = croatian/latin2-doc.tex czech/latin2-doc.tex \
 	hungarian/latin2-doc.tex lower-sorbian/latin2-doc.tex \
 	polish/latin2-doc.tex romanian/latin2-doc.tex \
-	slovak/small-latin2-doc.tex slovak/large-latin2-doc.tex \
+	slovak/large-latin2-doc.tex slovak/small-latin2-doc.tex \
 	slovenian/latin2-doc.tex upper-sorbian/latin2-doc.tex
 DOCS_LATIN3 = esperanto/latin3-doc.tex turkish/latin3-doc.tex
 DOCS_LATIN4 = greek/translit-latin4-doc.tex latvian/latin4-doc.tex \
@@ -433,19 +464,19 @@ DOCS_UTF8_LAT = albanian/utf8-doc.tex croatian/utf8-doc.tex \
 	estonian/utf8-doc.tex finnish/utf8-doc.tex french/utf8-doc.tex \
 	general/utf8-doc.tex german/din5007-utf8-doc.tex \
 	german/duden-utf8-doc.tex greek/translit-utf8-doc.tex \
-	greek/utf8-doc.tex gypsy/northrussian-utf8-doc.tex \
-	hausa/utf8-doc.tex hungarian/utf8-doc.tex \
-	icelandic/utf8-doc.tex italian/utf8-doc.tex \
-	kurdish/bedirxan-utf8-doc.tex kurdish/turkish-i-utf8-doc.tex \
-	latin/utf8-doc.tex latvian/utf8-doc.tex \
-	lithuanian/utf8-doc.tex lower-sorbian/utf8-doc.tex \
-	norwegian/utf8-doc.tex polish/utf8-doc.tex \
-	portuguese/utf8-doc.tex romanian/utf8-doc.tex \
-	russian/translit-iso-utf8-doc.tex slovak/small-utf8-doc.tex \
-	slovak/large-utf8-doc.tex slovenian/utf8-doc.tex \
-	spanish/modern-utf8-doc.tex spanish/traditional-utf8-doc.tex \
-	swedish/utf8-doc.tex turkish/utf8-doc.tex \
-	upper-sorbian/utf8-doc.tex vietnamese/utf8-doc.tex
+	gypsy/northrussian-utf8-doc.tex hausa/utf8-doc.tex \
+	hungarian/utf8-doc.tex icelandic/utf8-doc.tex \
+	italian/utf8-doc.tex kurdish/bedirxan-utf8-doc.tex \
+	kurdish/turkish-i-utf8-doc.tex latin/utf8-doc.tex \
+	latvian/utf8-doc.tex lithuanian/utf8-doc.tex \
+	lower-sorbian/utf8-doc.tex norwegian/utf8-doc.tex \
+	polish/utf8-doc.tex portuguese/utf8-doc.tex \
+	romanian/utf8-doc.tex russian/translit-iso-utf8-doc.tex \
+	slovak/large-utf8-doc.tex slovak/small-utf8-doc.tex \
+	slovenian/utf8-doc.tex spanish/modern-utf8-doc.tex \
+	spanish/traditional-utf8-doc.tex swedish/utf8-doc.tex \
+	turkish/utf8-doc.tex upper-sorbian/utf8-doc.tex \
+	vietnamese/utf8-doc.tex
 DOCS_UTF8_CYR = belarusian/utf8-doc.tex bulgarian/utf8-doc.tex \
 	macedonian/utf8-doc.tex mongolian/cyrillic-utf8-doc.tex \
 	russian/utf8-doc.tex serbian/utf8-doc.tex \
@@ -453,128 +484,99 @@ DOCS_UTF8_CYR = belarusian/utf8-doc.tex bulgarian/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
-EXTRA_DIST = albanian/utf8.pl.in belarusian/utf8.pl.in \
-	bulgarian/utf8.pl.in croatian/utf8.pl.in czech/utf8.pl.in \
-	danish/utf8.pl.in dutch/ij-as-ij-utf8.pl.in \
+EXTRA_DIST = mk-lang.sh lang.defs albanian/utf8.pl.in \
+	belarusian/utf8.pl.in bulgarian/utf8.pl.in croatian/utf8.pl.in \
+	czech/utf8.pl.in danish/utf8.pl.in dutch/ij-as-ij-utf8.pl.in \
 	dutch/ij-as-y-utf8.pl.in english/utf8.pl.in \
 	esperanto/utf8.pl.in estonian/utf8.pl.in finnish/utf8.pl.in \
-	french/utf8.pl.in general/template.pl general/utf8.pl.in \
-	georgian/utf8.pl.in german/braille-utf8.pl.in \
-	german/duden-utf8.pl.in german/din5007-utf8.pl.in \
+	french/utf8.pl.in general/utf8.pl.in georgian/utf8.pl.in \
+	german/braille-utf8.pl.in german/din5007-utf8.pl.in \
+	german/duden-utf8.pl.in greek/utf8.pl.in \
 	greek/polytonic-utf8.pl.in greek/translit-utf8.pl.in \
-	greek/utf8.pl.in gypsy/northrussian-utf8.pl.in \
-	hausa/utf8.pl.in hebrew/utf8.pl.in hungarian/utf8.pl.in \
-	icelandic/utf8.pl.in italian/utf8.pl.in klingon/utf8.pl.in \
-	klingon/translit-ascii.pl kurdish/bedirxan-utf8.pl.in \
-	kurdish/turkish-i-utf8.pl.in latin/utf8.pl.in \
-	latvian/utf8.pl.in lithuanian/utf8.pl.in \
+	gypsy/northrussian-utf8.pl.in hausa/utf8.pl.in \
+	hebrew/utf8.pl.in hungarian/utf8.pl.in icelandic/utf8.pl.in \
+	italian/utf8.pl.in klingon/utf8.pl.in \
+	kurdish/bedirxan-utf8.pl.in kurdish/turkish-i-utf8.pl.in \
+	latin/utf8.pl.in latvian/utf8.pl.in lithuanian/utf8.pl.in \
 	lower-sorbian/utf8.pl.in macedonian/utf8.pl.in \
 	mongolian/cyrillic-utf8.pl.in norwegian/utf8.pl.in \
 	polish/utf8.pl.in portuguese/utf8.pl.in rom-comma-kludge.sed \
-	romanian/utf8.pl.in russian/translit-iso-utf8.pl.in \
-	russian/utf8.pl.in serbian/utf8.pl.in slovak/large-utf8.pl.in \
-	slovak/small-utf8.pl.in slovenian/utf8.pl.in \
-	spanish/modern-utf8.pl.in spanish/traditional-utf8.pl.in \
-	swedish/utf8.pl.in test1/test1.pl turkish/utf8.pl.in \
-	ukrainian/utf8.pl.in upper-sorbian/utf8.pl.in \
-	vietnamese/utf8.pl.in $(SCRS) test.xdy
-CLEANFILES = albanian/latin1.pl albanian/latin1.raw albanian/utf8.pl \
-	albanian/utf8.raw belarusian/cp1251.pl belarusian/cp1251.raw \
-	belarusian/iso88595.pl belarusian/iso88595.raw \
-	belarusian/isoir111.pl belarusian/isoir111.raw \
-	belarusian/utf8.pl belarusian/utf8.raw bulgarian/cp1251.pl \
-	bulgarian/cp1251.raw bulgarian/iso88595.pl \
-	bulgarian/iso88595.raw bulgarian/koi8-r.pl \
-	bulgarian/koi8-r.raw bulgarian/utf8.pl bulgarian/utf8.raw \
-	croatian/cp1250.pl croatian/cp1250.raw croatian/latin2.pl \
-	croatian/latin2.raw croatian/utf8.pl croatian/utf8.raw \
-	czech/cp1250.pl czech/cp1250.raw czech/latin2.pl \
-	czech/latin2.raw czech/utf8.pl czech/utf8.raw danish/cp1252.pl \
-	danish/cp1252.raw danish/latin9.pl danish/latin9.raw \
-	danish/utf8.pl danish/utf8.raw dutch/ij-as-ij-latin1.pl \
-	dutch/ij-as-ij-latin1.raw dutch/ij-as-ij-utf8.pl \
-	dutch/ij-as-ij-utf8.raw dutch/ij-as-y-utf8.pl \
-	dutch/ij-as-y-utf8.raw english/cp1252.pl english/cp1252.raw \
-	english/latin9.pl english/latin9.raw english/utf8.pl \
-	english/utf8.raw esperanto/latin3.pl esperanto/latin3.raw \
-	esperanto/utf8.pl esperanto/utf8.raw estonian/cp1252.pl \
-	estonian/cp1252.raw estonian/latin9.pl estonian/latin9.raw \
-	estonian/utf8.pl estonian/utf8.raw finnish/cp1252.pl \
-	finnish/cp1252.raw finnish/latin9.pl finnish/latin9.raw \
-	finnish/utf8.pl finnish/utf8.raw french/cp1252.pl \
-	french/cp1252.raw french/latin9.pl french/latin9.raw \
-	french/utf8.pl french/utf8.raw general/cp1252.pl \
-	general/cp1252.raw general/cp850.pl general/cp850.raw \
-	general/latin9.pl general/latin9.raw general/utf8.pl \
-	general/utf8.raw georgian/utf8.pl georgian/utf8.raw \
-	german/braille-utf8.pl german/braille-utf8.raw \
-	german/din5007-latin1.pl german/din5007-latin1.raw \
-	german/din5007-utf8.pl german/din5007-utf8.raw \
-	german/duden-latin1.pl german/duden-latin1.raw \
-	german/duden-utf8.pl german/duden-utf8.raw greek/iso88597.pl \
+	romanian/utf8.pl.in russian/utf8.pl.in \
+	russian/translit-iso-utf8.pl.in serbian/utf8.pl.in \
+	slovak/large-utf8.pl.in slovak/small-utf8.pl.in \
+	slovenian/utf8.pl.in spanish/modern-utf8.pl.in \
+	spanish/traditional-utf8.pl.in swedish/utf8.pl.in \
+	turkish/utf8.pl.in ukrainian/utf8.pl.in \
+	upper-sorbian/utf8.pl.in vietnamese/utf8.pl.in $(SCRS) \
+	test.xdy
+CLEANFILES = albanian/utf8.pl albanian/utf8.raw albanian/latin1.raw \
+	belarusian/utf8.pl belarusian/utf8.raw belarusian/iso88595.raw \
+	belarusian/isoir111.raw belarusian/cp1251.raw \
+	bulgarian/utf8.pl bulgarian/utf8.raw bulgarian/iso88595.raw \
+	bulgarian/koi8-r.raw bulgarian/cp1251.raw croatian/utf8.pl \
+	croatian/utf8.raw croatian/cp1250.raw croatian/latin2.raw \
+	czech/utf8.pl czech/utf8.raw czech/cp1250.raw czech/latin2.raw \
+	danish/utf8.pl danish/utf8.raw danish/cp1252.raw \
+	danish/latin9.raw dutch/ij-as-ij-utf8.pl \
+	dutch/ij-as-ij-utf8.raw dutch/ij-as-ij-latin1.raw \
+	dutch/ij-as-y-utf8.pl dutch/ij-as-y-utf8.raw english/utf8.pl \
+	english/utf8.raw english/cp1252.raw english/latin9.raw \
+	esperanto/utf8.pl esperanto/utf8.raw esperanto/latin3.raw \
+	estonian/utf8.pl estonian/utf8.raw estonian/cp1252.raw \
+	estonian/latin9.raw finnish/utf8.pl finnish/utf8.raw \
+	finnish/cp1252.raw finnish/latin9.raw french/utf8.pl \
+	french/utf8.raw french/cp1252.raw french/latin9.raw \
+	general/utf8.pl general/utf8.raw general/cp1252.raw \
+	general/cp850.raw general/latin9.raw georgian/utf8.pl \
+	georgian/utf8.raw german/braille-utf8.pl \
+	german/braille-utf8.raw german/din5007-utf8.pl \
+	german/din5007-utf8.raw german/din5007-latin1.raw \
+	german/duden-utf8.pl german/duden-utf8.raw \
+	german/duden-latin1.raw greek/utf8.pl greek/utf8.raw \
 	greek/iso88597.raw greek/polytonic-utf8.pl \
-	greek/polytonic-utf8.raw greek/translit-latin4.pl \
-	greek/translit-latin4.raw greek/translit-utf8.pl \
-	greek/translit-utf8.raw greek/utf8.pl greek/utf8.raw \
+	greek/polytonic-utf8.raw greek/translit-utf8.pl \
+	greek/translit-utf8.raw greek/translit-latin4.raw \
 	gypsy/northrussian-utf8.pl gypsy/northrussian-utf8.raw \
-	hausa/utf8.pl hausa/utf8.raw hebrew/iso88598.pl \
-	hebrew/iso88598.raw hebrew/utf8.pl hebrew/utf8.raw \
-	hungarian/cp1250.pl hungarian/cp1250.raw hungarian/latin2.pl \
-	hungarian/latin2.raw hungarian/utf8.pl hungarian/utf8.raw \
-	icelandic/cp1252.pl icelandic/cp1252.raw icelandic/latin9.pl \
-	icelandic/latin9.raw icelandic/utf8.pl icelandic/utf8.raw \
-	italian/latin1.pl italian/latin1.raw italian/utf8.pl \
-	italian/utf8.raw klingon/utf8.pl klingon/utf8.raw \
-	kurdish/bedirxan-latin5.pl kurdish/bedirxan-latin5.raw \
-	kurdish/bedirxan-utf8.pl kurdish/bedirxan-utf8.raw \
-	kurdish/turkish-i-latin5.pl kurdish/turkish-i-latin5.raw \
+	hausa/utf8.pl hausa/utf8.raw hebrew/utf8.pl hebrew/utf8.raw \
+	hebrew/iso88598.raw hungarian/utf8.pl hungarian/utf8.raw \
+	hungarian/cp1250.raw hungarian/latin2.raw icelandic/utf8.pl \
+	icelandic/utf8.raw icelandic/cp1252.raw icelandic/latin9.raw \
+	italian/utf8.pl italian/utf8.raw italian/latin1.raw \
+	klingon/utf8.pl klingon/utf8.raw kurdish/bedirxan-utf8.pl \
+	kurdish/bedirxan-utf8.raw kurdish/bedirxan-latin5.raw \
 	kurdish/turkish-i-utf8.pl kurdish/turkish-i-utf8.raw \
-	latin/utf8.pl latin/utf8.raw latvian/latin4.pl \
-	latvian/latin4.raw latvian/utf8.pl latvian/utf8.raw \
-	lithuanian/latin4.pl lithuanian/latin4.raw lithuanian/utf8.pl \
-	lithuanian/utf8.raw lower-sorbian/cp1250.pl \
-	lower-sorbian/cp1250.raw lower-sorbian/latin2.pl \
-	lower-sorbian/latin2.raw lower-sorbian/utf8.pl \
-	lower-sorbian/utf8.raw macedonian/cp1251.pl \
-	macedonian/cp1251.raw macedonian/iso88595.pl \
-	macedonian/iso88595.raw macedonian/isoir111.pl \
-	macedonian/isoir111.raw macedonian/utf8.pl macedonian/utf8.raw \
+	kurdish/turkish-i-latin5.raw latin/utf8.pl latin/utf8.raw \
+	latvian/utf8.pl latvian/utf8.raw latvian/latin4.raw \
+	lithuanian/utf8.pl lithuanian/utf8.raw lithuanian/latin4.raw \
+	lower-sorbian/utf8.pl lower-sorbian/utf8.raw \
+	lower-sorbian/cp1250.raw lower-sorbian/latin2.raw \
+	macedonian/utf8.pl macedonian/utf8.raw macedonian/iso88595.raw \
+	macedonian/isoir111.raw macedonian/cp1251.raw \
 	mongolian/cyrillic-utf8.pl mongolian/cyrillic-utf8.raw \
-	norwegian/latin1.pl norwegian/latin1.raw norwegian/utf8.pl \
-	norwegian/utf8.raw polish/cp1250.pl polish/cp1250.raw \
-	polish/latin2.pl polish/latin2.raw polish/utf8.pl \
-	polish/utf8.raw portuguese/latin1.pl portuguese/latin1.raw \
-	portuguese/utf8.pl portuguese/utf8.raw romanian/cp1250.raw \
-	romanian/cp1250.pl romanian/latin2.pl romanian/latin2.raw \
-	romanian/utf8.pl romanian/utf8.raw russian/cp1251.pl \
-	russian/cp1251.raw russian/iso88595.pl russian/iso88595.raw \
-	russian/koi8-r.pl russian/koi8-r.raw \
+	norwegian/utf8.pl norwegian/utf8.raw norwegian/latin1.raw \
+	polish/utf8.pl polish/utf8.raw polish/cp1250.raw \
+	polish/latin2.raw portuguese/utf8.pl portuguese/utf8.raw \
+	portuguese/latin1.raw romanian/utf8.pl romanian/utf8.raw \
+	romanian/latin2.raw russian/utf8.pl russian/utf8.raw \
+	russian/iso88595.raw russian/koi8-r.raw russian/cp1251.raw \
 	russian/translit-iso-utf8.pl russian/translit-iso-utf8.raw \
-	russian/utf8.pl russian/utf8.raw serbian/cp1251.pl \
-	serbian/cp1251.raw serbian/iso88595.pl serbian/iso88595.raw \
-	serbian/isoir111.pl serbian/isoir111.raw serbian/utf8.pl \
-	serbian/utf8.raw slovak/large-cp1250.pl \
-	slovak/large-cp1250.raw slovak/large-latin2.pl \
-	slovak/large-latin2.raw slovak/large-utf8.pl \
-	slovak/large-utf8.raw slovak/small-cp1250.pl \
-	slovak/small-cp1250.raw slovak/small-latin2.pl \
-	slovak/small-latin2.raw slovak/small-utf8.pl \
-	slovak/small-utf8.raw slovenian/cp1250.pl slovenian/cp1250.raw \
-	slovenian/latin2.pl slovenian/latin2.raw slovenian/utf8.pl \
-	slovenian/utf8.raw spanish/modern-latin1.pl \
-	spanish/modern-latin1.raw spanish/modern-utf8.pl \
-	spanish/modern-utf8.raw spanish/traditional-latin1.pl \
-	spanish/traditional-latin1.raw spanish/traditional-utf8.pl \
-	spanish/traditional-utf8.raw swedish/cp1252.pl \
-	swedish/cp1252.raw swedish/latin9.pl swedish/latin9.raw \
-	swedish/utf8.pl swedish/utf8.raw turkish/latin3.pl \
-	turkish/latin3.raw turkish/latin5.pl turkish/latin5.raw \
-	turkish/utf8.pl turkish/utf8.raw ukrainian/cp1251.pl \
-	ukrainian/cp1251.raw ukrainian/koi8-u.pl ukrainian/koi8-u.raw \
-	ukrainian/utf8.pl ukrainian/utf8.raw upper-sorbian/cp1250.pl \
-	upper-sorbian/cp1250.raw upper-sorbian/latin2.pl \
-	upper-sorbian/latin2.raw upper-sorbian/utf8.pl \
-	upper-sorbian/utf8.raw vietnamese/utf8.pl vietnamese/utf8.raw \
+	serbian/utf8.pl serbian/utf8.raw serbian/iso88595.raw \
+	serbian/isoir111.raw serbian/cp1251.raw slovak/large-utf8.pl \
+	slovak/large-utf8.raw slovak/large-cp1250.raw \
+	slovak/large-latin2.raw slovak/small-utf8.pl \
+	slovak/small-utf8.raw slovak/small-cp1250.raw \
+	slovak/small-latin2.raw slovenian/utf8.pl slovenian/utf8.raw \
+	slovenian/cp1250.raw slovenian/latin2.raw \
+	spanish/modern-utf8.pl spanish/modern-utf8.raw \
+	spanish/modern-latin1.raw spanish/traditional-utf8.pl \
+	spanish/traditional-utf8.raw spanish/traditional-latin1.raw \
+	swedish/utf8.pl swedish/utf8.raw swedish/cp1252.raw \
+	swedish/latin9.raw turkish/utf8.pl turkish/utf8.raw \
+	turkish/latin3.raw turkish/latin5.raw ukrainian/utf8.pl \
+	ukrainian/utf8.raw ukrainian/koi8-u.raw ukrainian/cp1251.raw \
+	upper-sorbian/utf8.pl upper-sorbian/utf8.raw \
+	upper-sorbian/cp1250.raw upper-sorbian/latin2.raw \
+	vietnamese/utf8.pl vietnamese/utf8.raw \
 	$(nobase_nodist_lang_DATA) $(DOCS) $(DOC_CLEAN)
 subdirs = albanian belarusian bulgarian croatian czech danish dutch \
 	english esperanto estonian finnish french general georgian \
@@ -860,11 +862,7 @@ uninstall-am: uninstall-docDATA uninstall-nobase_nodist_langDATA
 	uninstall-docDATA uninstall-nobase_nodist_langDATA
 
 
-romanian/cp1250.pl : romanian/utf8.pl
-	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-	$(CONVERT_FROM_UTF8)CP1250 >$@
-
-romanian/latin2.pl : romanian/utf8.pl
+romanian/latin2.pl : romanian/utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
 	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
 subdirs:
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.am
index 3ca5451ff2d..783a0ed476f 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/albanian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for albanian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += albanian
 
 nobase_nodist_lang_DATA += \
-	albanian/latin1-lang.xdy albanian/latin1-test.xdy albanian/latin1.xdy \
-	albanian/utf8-lang.xdy albanian/utf8-test.xdy albanian/utf8.xdy
+	albanian/utf8-lang.xdy \
+	albanian/utf8-test.xdy \
+	albanian/utf8.xdy \
+	albanian/latin1-lang.xdy \
+	albanian/latin1-test.xdy \
+	albanian/latin1.xdy
 
 DOCS_LATIN1 += \
 	albanian/latin1-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	albanian/utf8.pl.in
 
+dist_noinst_DATA += \
+	albanian/latin1.pl
+
 CLEANFILES += \
-	albanian/latin1.pl albanian/latin1.raw \
-	albanian/utf8.pl albanian/utf8.raw
+	albanian/utf8.pl \
+	albanian/utf8.raw \
+	albanian/latin1.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.am
index f7ef66f6e30..96f7e504b4b 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/belarusian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for belarusian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,10 +21,18 @@
 subdirs += belarusian
 
 nobase_nodist_lang_DATA += \
-	belarusian/cp1251-lang.xdy belarusian/cp1251-test.xdy belarusian/cp1251.xdy \
-	belarusian/iso88595-lang.xdy belarusian/iso88595-test.xdy belarusian/iso88595.xdy \
-	belarusian/isoir111-lang.xdy belarusian/isoir111-test.xdy belarusian/isoir111.xdy \
-	belarusian/utf8-lang.xdy belarusian/utf8-test.xdy belarusian/utf8.xdy
+	belarusian/utf8-lang.xdy \
+	belarusian/utf8-test.xdy \
+	belarusian/utf8.xdy \
+	belarusian/iso88595-lang.xdy \
+	belarusian/iso88595-test.xdy \
+	belarusian/iso88595.xdy \
+	belarusian/isoir111-lang.xdy \
+	belarusian/isoir111-test.xdy \
+	belarusian/isoir111.xdy \
+	belarusian/cp1251-lang.xdy \
+	belarusian/cp1251-test.xdy \
+	belarusian/cp1251.xdy
 
 DOCS_CYR_1251 += \
 	belarusian/cp1251-doc.tex
@@ -41,9 +49,15 @@ DOCS_UTF8_CYR += \
 EXTRA_DIST += \
 	belarusian/utf8.pl.in
 
+dist_noinst_DATA += \
+	belarusian/iso88595.pl \
+	belarusian/isoir111.pl \
+	belarusian/cp1251.pl
+
 CLEANFILES += \
-	belarusian/cp1251.pl belarusian/cp1251.raw \
-	belarusian/iso88595.pl belarusian/iso88595.raw \
-	belarusian/isoir111.pl belarusian/isoir111.raw \
-	belarusian/utf8.pl belarusian/utf8.raw
+	belarusian/utf8.pl \
+	belarusian/utf8.raw \
+	belarusian/iso88595.raw \
+	belarusian/isoir111.raw \
+	belarusian/cp1251.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.am
index 2066dbaa90e..cba41421fb6 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/bulgarian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for bulgarian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,10 +21,18 @@
 subdirs += bulgarian
 
 nobase_nodist_lang_DATA += \
-	bulgarian/cp1251-lang.xdy bulgarian/cp1251-test.xdy bulgarian/cp1251.xdy \
-	bulgarian/iso88595-lang.xdy bulgarian/iso88595-test.xdy bulgarian/iso88595.xdy \
-	bulgarian/koi8-r-lang.xdy bulgarian/koi8-r-test.xdy bulgarian/koi8-r.xdy \
-	bulgarian/utf8-lang.xdy bulgarian/utf8-test.xdy bulgarian/utf8.xdy
+	bulgarian/utf8-lang.xdy \
+	bulgarian/utf8-test.xdy \
+	bulgarian/utf8.xdy \
+	bulgarian/iso88595-lang.xdy \
+	bulgarian/iso88595-test.xdy \
+	bulgarian/iso88595.xdy \
+	bulgarian/koi8-r-lang.xdy \
+	bulgarian/koi8-r-test.xdy \
+	bulgarian/koi8-r.xdy \
+	bulgarian/cp1251-lang.xdy \
+	bulgarian/cp1251-test.xdy \
+	bulgarian/cp1251.xdy
 
 DOCS_CYR_1251 += \
 	bulgarian/cp1251-doc.tex
@@ -41,9 +49,15 @@ DOCS_UTF8_CYR += \
 EXTRA_DIST += \
 	bulgarian/utf8.pl.in
 
+dist_noinst_DATA += \
+	bulgarian/iso88595.pl \
+	bulgarian/koi8-r.pl \
+	bulgarian/cp1251.pl
+
 CLEANFILES += \
-	bulgarian/cp1251.pl bulgarian/cp1251.raw \
-	bulgarian/iso88595.pl bulgarian/iso88595.raw \
-	bulgarian/koi8-r.pl bulgarian/koi8-r.raw \
-	bulgarian/utf8.pl bulgarian/utf8.raw
+	bulgarian/utf8.pl \
+	bulgarian/utf8.raw \
+	bulgarian/iso88595.raw \
+	bulgarian/koi8-r.raw \
+	bulgarian/cp1251.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.am
index 4c2aee882a5..ff56d371dc8 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/croatian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for croatian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += croatian
 
 nobase_nodist_lang_DATA += \
-	croatian/cp1250-lang.xdy croatian/cp1250-test.xdy croatian/cp1250.xdy \
-	croatian/latin2-lang.xdy croatian/latin2-test.xdy croatian/latin2.xdy \
-	croatian/utf8-lang.xdy croatian/utf8-test.xdy croatian/utf8.xdy
+	croatian/utf8-lang.xdy \
+	croatian/utf8-test.xdy \
+	croatian/utf8.xdy \
+	croatian/cp1250-lang.xdy \
+	croatian/cp1250-test.xdy \
+	croatian/cp1250.xdy \
+	croatian/latin2-lang.xdy \
+	croatian/latin2-test.xdy \
+	croatian/latin2.xdy
 
 DOCS_CP1250 += \
 	croatian/cp1250-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	croatian/utf8.pl.in
 
+dist_noinst_DATA += \
+	croatian/cp1250.pl \
+	croatian/latin2.pl
+
 CLEANFILES += \
-	croatian/cp1250.pl croatian/cp1250.raw \
-	croatian/latin2.pl croatian/latin2.raw \
-	croatian/utf8.pl croatian/utf8.raw
+	croatian/utf8.pl \
+	croatian/utf8.raw \
+	croatian/cp1250.raw \
+	croatian/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.am
index 88f0e34b00a..99c434d0558 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/czech/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for czech.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += czech
 
 nobase_nodist_lang_DATA += \
-	czech/cp1250-lang.xdy czech/cp1250-test.xdy czech/cp1250.xdy \
-	czech/latin2-lang.xdy czech/latin2-test.xdy czech/latin2.xdy \
-	czech/utf8-lang.xdy czech/utf8-test.xdy czech/utf8.xdy
+	czech/utf8-lang.xdy \
+	czech/utf8-test.xdy \
+	czech/utf8.xdy \
+	czech/cp1250-lang.xdy \
+	czech/cp1250-test.xdy \
+	czech/cp1250.xdy \
+	czech/latin2-lang.xdy \
+	czech/latin2-test.xdy \
+	czech/latin2.xdy
 
 DOCS_CP1250 += \
 	czech/cp1250-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	czech/utf8.pl.in
 
+dist_noinst_DATA += \
+	czech/cp1250.pl \
+	czech/latin2.pl
+
 CLEANFILES += \
-	czech/cp1250.pl czech/cp1250.raw \
-	czech/latin2.pl czech/latin2.raw \
-	czech/utf8.pl czech/utf8.raw
+	czech/utf8.pl \
+	czech/utf8.raw \
+	czech/cp1250.raw \
+	czech/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.am
index f768f8fa68e..c5c3c6ef59d 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/danish/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for danish.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += danish
 
 nobase_nodist_lang_DATA += \
-	danish/cp1252-lang.xdy danish/cp1252-test.xdy danish/cp1252.xdy \
-	danish/latin9-lang.xdy danish/latin9-test.xdy danish/latin9.xdy \
-	danish/utf8-lang.xdy danish/utf8-test.xdy danish/utf8.xdy
+	danish/utf8-lang.xdy \
+	danish/utf8-test.xdy \
+	danish/utf8.xdy \
+	danish/cp1252-lang.xdy \
+	danish/cp1252-test.xdy \
+	danish/cp1252.xdy \
+	danish/latin9-lang.xdy \
+	danish/latin9-test.xdy \
+	danish/latin9.xdy
 
 DOCS_CP1252 += \
 	danish/cp1252-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	danish/utf8.pl.in
 
+dist_noinst_DATA += \
+	danish/cp1252.pl \
+	danish/latin9.pl
+
 CLEANFILES += \
-	danish/cp1252.pl danish/cp1252.raw \
-	danish/latin9.pl danish/latin9.raw \
-	danish/utf8.pl danish/utf8.raw
+	danish/utf8.pl \
+	danish/utf8.raw \
+	danish/cp1252.raw \
+	danish/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.am
index 4ba963436f0..fcef849852b 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/dutch/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for dutch.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += dutch
 
 nobase_nodist_lang_DATA += \
-	dutch/ij-as-ij-latin1-lang.xdy dutch/ij-as-ij-latin1-test.xdy dutch/ij-as-ij-latin1.xdy \
-	dutch/ij-as-ij-utf8-lang.xdy dutch/ij-as-ij-utf8-test.xdy dutch/ij-as-ij-utf8.xdy \
-	dutch/ij-as-y-utf8-lang.xdy dutch/ij-as-y-utf8-test.xdy dutch/ij-as-y-utf8.xdy
+	dutch/ij-as-ij-utf8-lang.xdy \
+	dutch/ij-as-ij-utf8-test.xdy \
+	dutch/ij-as-ij-utf8.xdy \
+	dutch/ij-as-ij-latin1-lang.xdy \
+	dutch/ij-as-ij-latin1-test.xdy \
+	dutch/ij-as-ij-latin1.xdy \
+	dutch/ij-as-y-utf8-lang.xdy \
+	dutch/ij-as-y-utf8-test.xdy \
+	dutch/ij-as-y-utf8.xdy
 
 DOCS_LATIN1 += \
 	dutch/ij-as-ij-latin1-doc.tex
@@ -36,8 +42,13 @@ EXTRA_DIST += \
 	dutch/ij-as-ij-utf8.pl.in \
 	dutch/ij-as-y-utf8.pl.in
 
+dist_noinst_DATA += \
+	dutch/ij-as-ij-latin1.pl
+
 CLEANFILES += \
-	dutch/ij-as-ij-latin1.pl dutch/ij-as-ij-latin1.raw \
-	dutch/ij-as-ij-utf8.pl dutch/ij-as-ij-utf8.raw \
-	dutch/ij-as-y-utf8.pl dutch/ij-as-y-utf8.raw
+	dutch/ij-as-ij-utf8.pl \
+	dutch/ij-as-ij-utf8.raw \
+	dutch/ij-as-ij-latin1.raw \
+	dutch/ij-as-y-utf8.pl \
+	dutch/ij-as-y-utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.am
index 108be15a6d6..ff82cb8b146 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/english/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for english.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,24 +21,35 @@
 subdirs += english
 
 nobase_nodist_lang_DATA += \
-	english/cp1252-lang.xdy english/cp1252-test.xdy english/cp1252.xdy \
-	english/latin9-lang.xdy  english/latin9-test.xdy english/latin9.xdy \
-	english/utf8-lang.xdy english/utf8-test.xdy english/utf8.xdy
+	english/utf8-lang.xdy \
+	english/utf8-test.xdy \
+	english/utf8.xdy \
+	english/cp1252-lang.xdy \
+	english/cp1252-test.xdy \
+	english/cp1252.xdy \
+	english/latin9-lang.xdy \
+	english/latin9-test.xdy \
+	english/latin9.xdy
 
 DOCS_CP1252 += \
 	english/cp1252-doc.tex
 
-DOCS_UTF8_LAT += \
-	english/utf8-doc.tex
-
 DOCS_LATIN9 += \
 	english/latin9-doc.tex
 
+DOCS_UTF8_LAT += \
+	english/utf8-doc.tex
+
 EXTRA_DIST += \
 	english/utf8.pl.in
 
+dist_noinst_DATA += \
+	english/cp1252.pl \
+	english/latin9.pl
+
 CLEANFILES += \
-	english/cp1252.pl english/cp1252.raw \
-	english/latin9.pl english/latin9.raw  \
-	english/utf8.pl english/utf8.raw
+	english/utf8.pl \
+	english/utf8.raw \
+	english/cp1252.raw \
+	english/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.am
index 183a5e1174b..0a7c35c638d 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/esperanto/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for esperanto.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += esperanto
 
 nobase_nodist_lang_DATA += \
-	esperanto/latin3-lang.xdy esperanto/latin3-test.xdy esperanto/latin3.xdy \
-	esperanto/utf8-lang.xdy esperanto/utf8-test.xdy esperanto/utf8.xdy
+	esperanto/utf8-lang.xdy \
+	esperanto/utf8-test.xdy \
+	esperanto/utf8.xdy \
+	esperanto/latin3-lang.xdy \
+	esperanto/latin3-test.xdy \
+	esperanto/latin3.xdy
 
 DOCS_LATIN3 += \
 	esperanto/latin3-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	esperanto/utf8.pl.in
 
+dist_noinst_DATA += \
+	esperanto/latin3.pl
+
 CLEANFILES += \
-	esperanto/latin3.pl esperanto/latin3.raw \
-	esperanto/utf8.pl esperanto/utf8.raw
+	esperanto/utf8.pl \
+	esperanto/utf8.raw \
+	esperanto/latin3.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.am
index ebf202e9319..f2f07863577 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/estonian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for estonian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += estonian
 
 nobase_nodist_lang_DATA += \
-	estonian/cp1252-lang.xdy estonian/cp1252-test.xdy estonian/cp1252.xdy \
-	estonian/latin9-lang.xdy estonian/latin9-test.xdy estonian/latin9.xdy \
-	estonian/utf8-lang.xdy estonian/utf8-test.xdy estonian/utf8.xdy
+	estonian/utf8-lang.xdy \
+	estonian/utf8-test.xdy \
+	estonian/utf8.xdy \
+	estonian/cp1252-lang.xdy \
+	estonian/cp1252-test.xdy \
+	estonian/cp1252.xdy \
+	estonian/latin9-lang.xdy \
+	estonian/latin9-test.xdy \
+	estonian/latin9.xdy
 
 DOCS_CP1252 += \
 	estonian/cp1252-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	estonian/utf8.pl.in
 
+dist_noinst_DATA += \
+	estonian/cp1252.pl \
+	estonian/latin9.pl
+
 CLEANFILES += \
-	estonian/cp1252.pl estonian/cp1252.raw \
-	estonian/latin9.pl estonian/latin9.raw \
-	estonian/utf8.pl estonian/utf8.raw
+	estonian/utf8.pl \
+	estonian/utf8.raw \
+	estonian/cp1252.raw \
+	estonian/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.am
index 6cf80ab7fcd..bbbcb21a7e0 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/finnish/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for finnish.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += finnish
 
 nobase_nodist_lang_DATA += \
-	finnish/cp1252-lang.xdy finnish/cp1252-test.xdy finnish/cp1252.xdy \
-	finnish/latin9-lang.xdy finnish/latin9-test.xdy finnish/latin9.xdy \
-	finnish/utf8-lang.xdy finnish/utf8-test.xdy finnish/utf8.xdy
+	finnish/utf8-lang.xdy \
+	finnish/utf8-test.xdy \
+	finnish/utf8.xdy \
+	finnish/cp1252-lang.xdy \
+	finnish/cp1252-test.xdy \
+	finnish/cp1252.xdy \
+	finnish/latin9-lang.xdy \
+	finnish/latin9-test.xdy \
+	finnish/latin9.xdy
 
 DOCS_CP1252 += \
 	finnish/cp1252-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	finnish/utf8.pl.in
 
+dist_noinst_DATA += \
+	finnish/cp1252.pl \
+	finnish/latin9.pl
+
 CLEANFILES += \
-	finnish/cp1252.pl finnish/cp1252.raw \
-	finnish/latin9.pl finnish/latin9.raw \
-	finnish/utf8.pl finnish/utf8.raw
+	finnish/utf8.pl \
+	finnish/utf8.raw \
+	finnish/cp1252.raw \
+	finnish/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.am
index 556fb9678b4..c4028510076 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/french/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for french.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += french
 
 nobase_nodist_lang_DATA += \
-	french/cp1252-lang.xdy french/cp1252-test.xdy french/cp1252.xdy \
-	french/latin9-lang.xdy french/latin9-test.xdy french/latin9.xdy \
-	french/utf8-lang.xdy french/utf8-test.xdy french/utf8.xdy
+	french/utf8-lang.xdy \
+	french/utf8-test.xdy \
+	french/utf8.xdy \
+	french/cp1252-lang.xdy \
+	french/cp1252-test.xdy \
+	french/cp1252.xdy \
+	french/latin9-lang.xdy \
+	french/latin9-test.xdy \
+	french/latin9.xdy
 
 DOCS_CP1252 += \
 	french/cp1252-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	french/utf8.pl.in
 
+dist_noinst_DATA += \
+	french/cp1252.pl \
+	french/latin9.pl
+
 CLEANFILES += \
-	french/cp1252.pl french/cp1252.raw \
-	french/latin9.pl french/latin9.raw \
-	french/utf8.pl french/utf8.raw
+	french/utf8.pl \
+	french/utf8.raw \
+	french/cp1252.raw \
+	french/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.am
index fc393f51893..e4c4ae759b4 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/general/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for general.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,10 +21,18 @@
 subdirs += general
 
 nobase_nodist_lang_DATA += \
-	general/cp1252-lang.xdy general/cp1252-test.xdy general/cp1252.xdy \
-	general/cp850-lang.xdy general/cp850-test.xdy general/cp850.xdy \
-	general/latin9-lang.xdy general/latin9-test.xdy general/latin9.xdy \
-	general/utf8-lang.xdy general/utf8-test.xdy general/utf8.xdy
+	general/utf8-lang.xdy \
+	general/utf8-test.xdy \
+	general/utf8.xdy \
+	general/cp1252-lang.xdy \
+	general/cp1252-test.xdy \
+	general/cp1252.xdy \
+	general/cp850-lang.xdy \
+	general/cp850-test.xdy \
+	general/cp850.xdy \
+	general/latin9-lang.xdy \
+	general/latin9-test.xdy \
+	general/latin9.xdy
 
 DOCS_CP1252 += \
 	general/cp1252-doc.tex
@@ -39,12 +47,18 @@ DOCS_UTF8_LAT += \
 	general/utf8-doc.tex
 
 EXTRA_DIST += \
-	general/template.pl \
 	general/utf8.pl.in
 
+dist_noinst_DATA += \
+	general/cp1252.pl \
+	general/cp850.pl \
+	general/latin9.pl \
+	general/template.pl
+
 CLEANFILES += \
-	general/cp1252.pl general/cp1252.raw \
-	general/cp850.pl general/cp850.raw \
-	general/latin9.pl general/latin9.raw \
-	general/utf8.pl general/utf8.raw
+	general/utf8.pl \
+	general/utf8.raw \
+	general/cp1252.raw \
+	general/cp850.raw \
+	general/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.am
index 0db970e5e44..f23cfe3137c 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/georgian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for georgian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,7 +21,9 @@
 subdirs += georgian
 
 nobase_nodist_lang_DATA += \
-	georgian/utf8-lang.xdy georgian/utf8-test.xdy georgian/utf8.xdy
+	georgian/utf8-lang.xdy \
+	georgian/utf8-test.xdy \
+	georgian/utf8.xdy
 
 DOCS_UTF8_OTHER += \
 	georgian/utf8-doc.tex
@@ -30,5 +32,6 @@ EXTRA_DIST += \
 	georgian/utf8.pl.in
 
 CLEANFILES += \
-	georgian/utf8.pl georgian/utf8.raw
+	georgian/utf8.pl \
+	georgian/utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.am
index 886c440b58b..6e362d22fce 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/german/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for german.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,11 +21,21 @@
 subdirs += german
 
 nobase_nodist_lang_DATA += \
-	german/braille-utf8-lang.xdy german/braille-utf8-test.xdy german/braille-utf8.xdy \
-	german/din5007-latin1-lang.xdy german/din5007-latin1-test.xdy german/din5007-latin1.xdy \
-	german/din5007-utf8-lang.xdy german/din5007-utf8-test.xdy german/din5007-utf8.xdy \
-	german/duden-latin1-lang.xdy german/duden-latin1-test.xdy german/duden-latin1.xdy \
-	german/duden-utf8-lang.xdy german/duden-utf8-test.xdy german/duden-utf8.xdy
+	german/braille-utf8-lang.xdy \
+	german/braille-utf8-test.xdy \
+	german/braille-utf8.xdy \
+	german/din5007-utf8-lang.xdy \
+	german/din5007-utf8-test.xdy \
+	german/din5007-utf8.xdy \
+	german/din5007-latin1-lang.xdy \
+	german/din5007-latin1-test.xdy \
+	german/din5007-latin1.xdy \
+	german/duden-utf8-lang.xdy \
+	german/duden-utf8-test.xdy \
+	german/duden-utf8.xdy \
+	german/duden-latin1-lang.xdy \
+	german/duden-latin1-test.xdy \
+	german/duden-latin1.xdy
 
 DOCS_LATIN1 += \
 	german/din5007-latin1-doc.tex \
@@ -40,13 +50,20 @@ DOCS_UTF8_OTHER += \
 
 EXTRA_DIST += \
 	german/braille-utf8.pl.in \
-	german/duden-utf8.pl.in \
-	german/din5007-utf8.pl.in
+	german/din5007-utf8.pl.in \
+	german/duden-utf8.pl.in
+
+dist_noinst_DATA += \
+	german/din5007-latin1.pl \
+	german/duden-latin1.pl
 
 CLEANFILES += \
-	german/braille-utf8.pl german/braille-utf8.raw \
-	german/din5007-latin1.pl german/din5007-latin1.raw \
-	german/din5007-utf8.pl german/din5007-utf8.raw \
-	german/duden-latin1.pl german/duden-latin1.raw \
-	german/duden-utf8.pl german/duden-utf8.raw
+	german/braille-utf8.pl \
+	german/braille-utf8.raw \
+	german/din5007-utf8.pl \
+	german/din5007-utf8.raw \
+	german/din5007-latin1.raw \
+	german/duden-utf8.pl \
+	german/duden-utf8.raw \
+	german/duden-latin1.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.am
index 322b9f0fb70..c993328b8fc 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/greek/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for greek.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,11 +21,21 @@
 subdirs += greek
 
 nobase_nodist_lang_DATA += \
-	greek/iso88597-lang.xdy greek/iso88597-test.xdy greek/iso88597.xdy \
-	greek/polytonic-utf8-lang.xdy greek/polytonic-utf8-test.xdy greek/polytonic-utf8.xdy \
-	greek/translit-latin4-lang.xdy greek/translit-latin4-test.xdy greek/translit-latin4.xdy \
-	greek/translit-utf8-lang.xdy greek/translit-utf8-test.xdy greek/translit-utf8.xdy \
-	greek/utf8-lang.xdy greek/utf8-test.xdy greek/utf8.xdy
+	greek/utf8-lang.xdy \
+	greek/utf8-test.xdy \
+	greek/utf8.xdy \
+	greek/iso88597-lang.xdy \
+	greek/iso88597-test.xdy \
+	greek/iso88597.xdy \
+	greek/polytonic-utf8-lang.xdy \
+	greek/polytonic-utf8-test.xdy \
+	greek/polytonic-utf8.xdy \
+	greek/translit-utf8-lang.xdy \
+	greek/translit-utf8-test.xdy \
+	greek/translit-utf8.xdy \
+	greek/translit-latin4-lang.xdy \
+	greek/translit-latin4-test.xdy \
+	greek/translit-latin4.xdy
 
 DOCS_LATIN4 += \
 	greek/translit-latin4-doc.tex
@@ -34,22 +44,28 @@ DOCS_ISO88597 += \
 	greek/iso88597-doc.tex
 
 DOCS_UTF8_LAT += \
-	greek/translit-utf8-doc.tex \
-	greek/utf8-doc.tex
+	greek/translit-utf8-doc.tex
 
 DOCS_UTF8_OTHER += \
 	greek/utf8-doc.tex \
 	greek/polytonic-utf8-doc.tex
 
 EXTRA_DIST += \
+	greek/utf8.pl.in \
 	greek/polytonic-utf8.pl.in \
-	greek/translit-utf8.pl.in \
-	greek/utf8.pl.in
+	greek/translit-utf8.pl.in
+
+dist_noinst_DATA += \
+	greek/iso88597.pl \
+	greek/translit-latin4.pl
 
 CLEANFILES += \
-	greek/iso88597.pl greek/iso88597.raw \
-	greek/polytonic-utf8.pl greek/polytonic-utf8.raw \
-	greek/translit-latin4.pl greek/translit-latin4.raw \
-	greek/translit-utf8.pl greek/translit-utf8.raw \
-	greek/utf8.pl greek/utf8.raw
+	greek/utf8.pl \
+	greek/utf8.raw \
+	greek/iso88597.raw \
+	greek/polytonic-utf8.pl \
+	greek/polytonic-utf8.raw \
+	greek/translit-utf8.pl \
+	greek/translit-utf8.raw \
+	greek/translit-latin4.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.am
index 6346b631a84..481a85aa383 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/gypsy/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for gypsy.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,7 +21,9 @@
 subdirs += gypsy
 
 nobase_nodist_lang_DATA += \
-	gypsy/northrussian-utf8-lang.xdy gypsy/northrussian-utf8-test.xdy gypsy/northrussian-utf8.xdy
+	gypsy/northrussian-utf8-lang.xdy \
+	gypsy/northrussian-utf8-test.xdy \
+	gypsy/northrussian-utf8.xdy
 
 DOCS_UTF8_LAT += \
 	gypsy/northrussian-utf8-doc.tex
@@ -30,5 +32,6 @@ EXTRA_DIST += \
 	gypsy/northrussian-utf8.pl.in
 
 CLEANFILES += \
-	gypsy/northrussian-utf8.pl gypsy/northrussian-utf8.raw
+	gypsy/northrussian-utf8.pl \
+	gypsy/northrussian-utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.am
index 51954075cb5..71cc2f55f5b 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hausa/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for hausa.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,7 +21,9 @@
 subdirs += hausa
 
 nobase_nodist_lang_DATA += \
-	hausa/utf8-lang.xdy hausa/utf8-test.xdy hausa/utf8.xdy
+	hausa/utf8-lang.xdy \
+	hausa/utf8-test.xdy \
+	hausa/utf8.xdy
 
 DOCS_UTF8_LAT += \
 	hausa/utf8-doc.tex
@@ -30,5 +32,6 @@ EXTRA_DIST += \
 	hausa/utf8.pl.in
 
 CLEANFILES += \
-	hausa/utf8.pl hausa/utf8.raw
+	hausa/utf8.pl \
+	hausa/utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.am
index 8e573d0530b..aa9f964f1f7 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hebrew/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for hebrew.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += hebrew
 
 nobase_nodist_lang_DATA += \
-	hebrew/iso88598-lang.xdy hebrew/iso88598-test.xdy hebrew/iso88598.xdy \
-	hebrew/utf8-lang.xdy hebrew/utf8-test.xdy hebrew/utf8.xdy
+	hebrew/utf8-lang.xdy \
+	hebrew/utf8-test.xdy \
+	hebrew/utf8.xdy \
+	hebrew/iso88598-lang.xdy \
+	hebrew/iso88598-test.xdy \
+	hebrew/iso88598.xdy
 
 DOCS_ISO88598 += \
 	hebrew/iso88598-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_OTHER += \
 EXTRA_DIST += \
 	hebrew/utf8.pl.in
 
+dist_noinst_DATA += \
+	hebrew/iso88598.pl
+
 CLEANFILES += \
-	hebrew/iso88598.pl hebrew/iso88598.raw \
-	hebrew/utf8.pl hebrew/utf8.raw
+	hebrew/utf8.pl \
+	hebrew/utf8.raw \
+	hebrew/iso88598.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.am
index 4780e2e2ee2..8034a98868b 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/hungarian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for hungarian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += hungarian
 
 nobase_nodist_lang_DATA += \
-	hungarian/cp1250-lang.xdy hungarian/cp1250-test.xdy hungarian/cp1250.xdy \
-	hungarian/latin2-lang.xdy hungarian/latin2-test.xdy hungarian/latin2.xdy \
-	hungarian/utf8-lang.xdy hungarian/utf8-test.xdy hungarian/utf8.xdy
+	hungarian/utf8-lang.xdy \
+	hungarian/utf8-test.xdy \
+	hungarian/utf8.xdy \
+	hungarian/cp1250-lang.xdy \
+	hungarian/cp1250-test.xdy \
+	hungarian/cp1250.xdy \
+	hungarian/latin2-lang.xdy \
+	hungarian/latin2-test.xdy \
+	hungarian/latin2.xdy
 
 DOCS_CP1250 += \
 	hungarian/cp1250-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	hungarian/utf8.pl.in
 
+dist_noinst_DATA += \
+	hungarian/cp1250.pl \
+	hungarian/latin2.pl
+
 CLEANFILES += \
-	hungarian/cp1250.pl hungarian/cp1250.raw \
-	hungarian/latin2.pl hungarian/latin2.raw \
-	hungarian/utf8.pl hungarian/utf8.raw
+	hungarian/utf8.pl \
+	hungarian/utf8.raw \
+	hungarian/cp1250.raw \
+	hungarian/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.am
index f6316555935..abf8062bcc2 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/icelandic/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for icelandic.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += icelandic
 
 nobase_nodist_lang_DATA += \
-	icelandic/cp1252-lang.xdy icelandic/cp1252-test.xdy icelandic/cp1252.xdy \
-	icelandic/latin9-lang.xdy icelandic/latin9-test.xdy icelandic/latin9.xdy \
-	icelandic/utf8-lang.xdy icelandic/utf8-test.xdy icelandic/utf8.xdy
+	icelandic/utf8-lang.xdy \
+	icelandic/utf8-test.xdy \
+	icelandic/utf8.xdy \
+	icelandic/cp1252-lang.xdy \
+	icelandic/cp1252-test.xdy \
+	icelandic/cp1252.xdy \
+	icelandic/latin9-lang.xdy \
+	icelandic/latin9-test.xdy \
+	icelandic/latin9.xdy
 
 DOCS_CP1252 += \
 	icelandic/cp1252-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	icelandic/utf8.pl.in
 
+dist_noinst_DATA += \
+	icelandic/cp1252.pl \
+	icelandic/latin9.pl
+
 CLEANFILES += \
-	icelandic/cp1252.pl icelandic/cp1252.raw \
-	icelandic/latin9.pl icelandic/latin9.raw \
-	icelandic/utf8.pl icelandic/utf8.raw
+	icelandic/utf8.pl \
+	icelandic/utf8.raw \
+	icelandic/cp1252.raw \
+	icelandic/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.am
index 7922911f75b..9096511b919 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/italian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for italian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += italian
 
 nobase_nodist_lang_DATA += \
-	italian/latin1-lang.xdy italian/latin1-test.xdy italian/latin1.xdy \
-	italian/utf8-lang.xdy italian/utf8-test.xdy italian/utf8.xdy
+	italian/utf8-lang.xdy \
+	italian/utf8-test.xdy \
+	italian/utf8.xdy \
+	italian/latin1-lang.xdy \
+	italian/latin1-test.xdy \
+	italian/latin1.xdy
 
 DOCS_LATIN1 += \
 	italian/latin1-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	italian/utf8.pl.in
 
+dist_noinst_DATA += \
+	italian/latin1.pl
+
 CLEANFILES += \
-	italian/latin1.pl italian/latin1.raw \
-	italian/utf8.pl italian/utf8.raw
+	italian/utf8.pl \
+	italian/utf8.raw \
+	italian/latin1.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.am
index fc4e016f6b1..e18a5ee3192 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/klingon/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for klingon.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,7 +21,9 @@
 subdirs += klingon
 
 nobase_nodist_lang_DATA += \
-	klingon/utf8-lang.xdy klingon/utf8-test.xdy klingon/utf8.xdy
+	klingon/utf8-lang.xdy \
+	klingon/utf8-test.xdy \
+	klingon/utf8.xdy
 
 DOCS_UTF8_OTHER += \
 	klingon/utf8-doc.tex
@@ -29,9 +31,10 @@ DOCS_UTF8_OTHER += \
 EXTRA_DIST += \
 	klingon/utf8.pl.in
 
-EXTRA_DIST += \
+dist_noinst_DATA += \
 	klingon/translit-ascii.pl
 
 CLEANFILES += \
-	klingon/utf8.pl klingon/utf8.raw
+	klingon/utf8.pl \
+	klingon/utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.am
index 2ed55d67d14..3910329ac74 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/kurdish/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for kurdish.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,10 +21,18 @@
 subdirs += kurdish
 
 nobase_nodist_lang_DATA += \
-	kurdish/bedirxan-latin5-lang.xdy kurdish/bedirxan-latin5-test.xdy kurdish/bedirxan-latin5.xdy \
-	kurdish/bedirxan-utf8-lang.xdy kurdish/bedirxan-utf8-test.xdy kurdish/bedirxan-utf8.xdy \
-	kurdish/turkish-i-latin5-lang.xdy kurdish/turkish-i-latin5-test.xdy kurdish/turkish-i-latin5.xdy \
-	kurdish/turkish-i-utf8-lang.xdy kurdish/turkish-i-utf8-test.xdy kurdish/turkish-i-utf8.xdy
+	kurdish/bedirxan-utf8-lang.xdy \
+	kurdish/bedirxan-utf8-test.xdy \
+	kurdish/bedirxan-utf8.xdy \
+	kurdish/bedirxan-latin5-lang.xdy \
+	kurdish/bedirxan-latin5-test.xdy \
+	kurdish/bedirxan-latin5.xdy \
+	kurdish/turkish-i-utf8-lang.xdy \
+	kurdish/turkish-i-utf8-test.xdy \
+	kurdish/turkish-i-utf8.xdy \
+	kurdish/turkish-i-latin5-lang.xdy \
+	kurdish/turkish-i-latin5-test.xdy \
+	kurdish/turkish-i-latin5.xdy
 
 DOCS_LATIN5 += \
 	kurdish/bedirxan-latin5-doc.tex \
@@ -38,9 +46,15 @@ EXTRA_DIST += \
 	kurdish/bedirxan-utf8.pl.in \
 	kurdish/turkish-i-utf8.pl.in
 
+dist_noinst_DATA += \
+	kurdish/bedirxan-latin5.pl \
+	kurdish/turkish-i-latin5.pl
+
 CLEANFILES += \
-	kurdish/bedirxan-latin5.pl kurdish/bedirxan-latin5.raw \
-	kurdish/bedirxan-utf8.pl kurdish/bedirxan-utf8.raw \
-	kurdish/turkish-i-latin5.pl kurdish/turkish-i-latin5.raw \
-	kurdish/turkish-i-utf8.pl kurdish/turkish-i-utf8.raw
+	kurdish/bedirxan-utf8.pl \
+	kurdish/bedirxan-utf8.raw \
+	kurdish/bedirxan-latin5.raw \
+	kurdish/turkish-i-utf8.pl \
+	kurdish/turkish-i-utf8.raw \
+	kurdish/turkish-i-latin5.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lang.defs b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lang.defs
new file mode 100644
index 00000000000..a11fd8f3933
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lang.defs
@@ -0,0 +1,45 @@
+albanian UTF8_LAT LATIN1
+belarusian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
+bulgarian UTF8_CYR CYR_ISO88595 CYR_KOI8_R CYR_1251
+croatian UTF8_LAT CP1250 LATIN2
+czech UTF8_LAT CP1250 LATIN2
+danish UTF8_LAT CP1252 LATIN9
+dutch ij-as-ij UTF8_LAT LATIN1 ij-as-y UTF8_LAT
+english UTF8_LAT CP1252 LATIN9
+esperanto UTF8_LAT LATIN3
+estonian UTF8_LAT CP1252 LATIN9
+finnish UTF8_LAT CP1252 LATIN9
+french UTF8_LAT CP1252 LATIN9
+general UTF8_LAT CP1252 CP850 LATIN9
+georgian UTF8_OTHER
+german braille UTF8_OTHER din5007 UTF8_LAT LATIN1 duden UTF8_LAT LATIN1
+greek UTF8_OTHER ISO88597 polytonic UTF8_OTHER translit UTF8_LAT LATIN4
+gypsy northrussian UTF8_LAT 
+hausa UTF8_LAT
+hebrew UTF8_OTHER ISO88598
+hungarian UTF8_LAT CP1250 LATIN2
+icelandic UTF8_LAT CP1252 LATIN9
+italian UTF8_LAT LATIN1
+klingon UTF8_OTHER
+kurdish bedirxan UTF8_LAT LATIN5 turkish-i UTF8_LAT LATIN5
+latin UTF8_LAT
+latvian UTF8_LAT LATIN4
+lithuanian UTF8_LAT LATIN4
+lower-sorbian UTF8_LAT CP1250 LATIN2
+macedonian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
+mongolian cyrillic UTF8_CYR cyrillic
+norwegian UTF8_LAT LATIN1
+polish UTF8_LAT CP1250 LATIN2
+portuguese UTF8_LAT LATIN1
+romanian UTF8_LAT LATIN2
+russian UTF8_CYR CYR_ISO88595 CYR_KOI8_R CYR_1251 translit-iso UTF8_LAT
+serbian UTF8_CYR CYR_ISO88595 CYR_ISOIR111 CYR_1251
+slovak large UTF8_LAT CP1250 LATIN2 small UTF8_LAT CP1250 LATIN2
+slovenian UTF8_LAT CP1250 LATIN2
+spanish modern UTF8_LAT LATIN1 traditional UTF8_LAT LATIN1
+swedish UTF8_LAT CP1252 LATIN9
+test1
+turkish UTF8_LAT LATIN3 LATIN5
+upper-sorbian UTF8_LAT CP1250 LATIN2
+ukrainian UTF8_CYR CYR_KOI8_U CYR_1251
+vietnamese UTF8_LAT
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.am
index 7a88a8d9853..2d44b407ce4 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latin/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for latin.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,7 +21,9 @@
 subdirs += latin
 
 nobase_nodist_lang_DATA += \
-	latin/utf8-lang.xdy latin/utf8-test.xdy latin/utf8.xdy
+	latin/utf8-lang.xdy \
+	latin/utf8-test.xdy \
+	latin/utf8.xdy
 
 DOCS_UTF8_LAT += \
 	latin/utf8-doc.tex
@@ -30,5 +32,6 @@ EXTRA_DIST += \
 	latin/utf8.pl.in
 
 CLEANFILES += \
-	latin/utf8.pl latin/utf8.raw
+	latin/utf8.pl \
+	latin/utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.am
index 173363bd1b4..fcf1088d17d 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/latvian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for latvian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += latvian
 
 nobase_nodist_lang_DATA += \
-	latvian/latin4-lang.xdy latvian/latin4-test.xdy latvian/latin4.xdy \
-	latvian/utf8-lang.xdy latvian/utf8-test.xdy latvian/utf8.xdy
+	latvian/utf8-lang.xdy \
+	latvian/utf8-test.xdy \
+	latvian/utf8.xdy \
+	latvian/latin4-lang.xdy \
+	latvian/latin4-test.xdy \
+	latvian/latin4.xdy
 
 DOCS_LATIN4 += \
 	latvian/latin4-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	latvian/utf8.pl.in
 
+dist_noinst_DATA += \
+	latvian/latin4.pl
+
 CLEANFILES += \
-	latvian/latin4.pl latvian/latin4.raw \
-	latvian/utf8.pl latvian/utf8.raw
+	latvian/utf8.pl \
+	latvian/utf8.raw \
+	latvian/latin4.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.am
index a3a278abe44..e0b5782075c 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lithuanian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for lithuanian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += lithuanian
 
 nobase_nodist_lang_DATA += \
-	lithuanian/latin4-lang.xdy lithuanian/latin4-test.xdy lithuanian/latin4.xdy \
-	lithuanian/utf8-lang.xdy lithuanian/utf8-test.xdy lithuanian/utf8.xdy
+	lithuanian/utf8-lang.xdy \
+	lithuanian/utf8-test.xdy \
+	lithuanian/utf8.xdy \
+	lithuanian/latin4-lang.xdy \
+	lithuanian/latin4-test.xdy \
+	lithuanian/latin4.xdy
 
 DOCS_LATIN4 += \
 	lithuanian/latin4-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	lithuanian/utf8.pl.in
 
+dist_noinst_DATA += \
+	lithuanian/latin4.pl
+
 CLEANFILES += \
-	lithuanian/latin4.pl lithuanian/latin4.raw \
-	lithuanian/utf8.pl lithuanian/utf8.raw
+	lithuanian/utf8.pl \
+	lithuanian/utf8.raw \
+	lithuanian/latin4.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.am
index 380c5997a4c..0217be95602 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/lower-sorbian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for lower-sorbian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += lower-sorbian
 
 nobase_nodist_lang_DATA += \
-	lower-sorbian/cp1250-lang.xdy lower-sorbian/cp1250-test.xdy lower-sorbian/cp1250.xdy \
-	lower-sorbian/latin2-lang.xdy lower-sorbian/latin2-test.xdy lower-sorbian/latin2.xdy \
-	lower-sorbian/utf8-lang.xdy lower-sorbian/utf8-test.xdy lower-sorbian/utf8.xdy
+	lower-sorbian/utf8-lang.xdy \
+	lower-sorbian/utf8-test.xdy \
+	lower-sorbian/utf8.xdy \
+	lower-sorbian/cp1250-lang.xdy \
+	lower-sorbian/cp1250-test.xdy \
+	lower-sorbian/cp1250.xdy \
+	lower-sorbian/latin2-lang.xdy \
+	lower-sorbian/latin2-test.xdy \
+	lower-sorbian/latin2.xdy
 
 DOCS_CP1250 += \
 	lower-sorbian/cp1250-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	lower-sorbian/utf8.pl.in
 
+dist_noinst_DATA += \
+	lower-sorbian/cp1250.pl \
+	lower-sorbian/latin2.pl
+
 CLEANFILES += \
-	lower-sorbian/cp1250.pl lower-sorbian/cp1250.raw \
-	lower-sorbian/latin2.pl lower-sorbian/latin2.raw \
-	lower-sorbian/utf8.pl lower-sorbian/utf8.raw
+	lower-sorbian/utf8.pl \
+	lower-sorbian/utf8.raw \
+	lower-sorbian/cp1250.raw \
+	lower-sorbian/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.am
index 4dade38bc53..384025ee7f9 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/macedonian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for macedonian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,10 +21,18 @@
 subdirs += macedonian
 
 nobase_nodist_lang_DATA += \
-	macedonian/cp1251-lang.xdy macedonian/cp1251-test.xdy macedonian/cp1251.xdy \
-	macedonian/iso88595-lang.xdy macedonian/iso88595-test.xdy macedonian/iso88595.xdy \
-	macedonian/isoir111-lang.xdy macedonian/isoir111-test.xdy macedonian/isoir111.xdy \
-	macedonian/utf8-lang.xdy macedonian/utf8-test.xdy macedonian/utf8.xdy
+	macedonian/utf8-lang.xdy \
+	macedonian/utf8-test.xdy \
+	macedonian/utf8.xdy \
+	macedonian/iso88595-lang.xdy \
+	macedonian/iso88595-test.xdy \
+	macedonian/iso88595.xdy \
+	macedonian/isoir111-lang.xdy \
+	macedonian/isoir111-test.xdy \
+	macedonian/isoir111.xdy \
+	macedonian/cp1251-lang.xdy \
+	macedonian/cp1251-test.xdy \
+	macedonian/cp1251.xdy
 
 DOCS_CYR_1251 += \
 	macedonian/cp1251-doc.tex
@@ -41,9 +49,15 @@ DOCS_UTF8_CYR += \
 EXTRA_DIST += \
 	macedonian/utf8.pl.in
 
+dist_noinst_DATA += \
+	macedonian/iso88595.pl \
+	macedonian/isoir111.pl \
+	macedonian/cp1251.pl
+
 CLEANFILES += \
-	macedonian/cp1251.pl macedonian/cp1251.raw \
-	macedonian/iso88595.pl macedonian/iso88595.raw \
-	macedonian/isoir111.pl macedonian/isoir111.raw \
-	macedonian/utf8.pl macedonian/utf8.raw
+	macedonian/utf8.pl \
+	macedonian/utf8.raw \
+	macedonian/iso88595.raw \
+	macedonian/isoir111.raw \
+	macedonian/cp1251.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mk-lang.sh b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mk-lang.sh
new file mode 100644
index 00000000000..121261b991d
--- /dev/null
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mk-lang.sh
@@ -0,0 +1,213 @@
+#! /bin/sh
+
+# Copyright (C) 2010 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.
+
+# Generate the Makefile fragments lang/Makefile.am from language
+# definitions in lang.defs containing lines:
+#   lang [[prefix] UTF8_DOC [DOC]...]...
+# where
+#   prefix is an optional filename prefix, without final '-'
+#   UTF8_DOC is a DOCS_UTF8_* variable, without leading 'DOCS_'
+#   DOC is an other DOCS_* variable, without leading 'DOCS_'
+
+CP_DOCS='CP1250 CP1252 CP850'
+LATIN_DOCS='LATIN1 LATIN2 LATIN3 LATIN4 LATIN5 LATIN9'
+CYR_DOCS='CYR_1251 CYR_ISO88595 CYR_ISOIR111 CYR_KOI8_R CYR_KOI8_U'
+ISO_DOCS='ISO88597 ISO88598'
+UTF_DOCS='UTF8_LAT UTF8_CYR UTF8_OTHER'
+
+ALL_DOCS="$CP_DOCS $LATIN_DOCS $CYR_DOCS $ISO_DOCS $UTF_DOCS"
+
+err_exit () {
+	echo "bad argument \"$arg\""
+	exit 1
+}
+
+do_XDY () {
+	XDY="$XDY $name"
+	eval DOCS_$arg="\"\$DOCS_$arg $name\""
+}
+
+do_UTF8 () {
+	PLIN="$PLIN $name"
+	do_XDY
+}
+
+do_CODE () {
+	PL="$PL $name"
+	do_XDY
+}
+
+parse_lang () {
+	for DOC in $ALL_DOCS; do
+		eval DOCS_$DOC=
+	done
+	PLIN= PL= XDY=	
+	lang=$1
+	shift
+	pref=
+	for arg
+	do
+		case $arg in
+			[a-z]*) pref="$arg-";;
+			UTF8_*) name=${pref}utf8; do_UTF8;;
+			[A-Z]*)	case $arg in
+					CP*) val="cp${arg:2}";;
+					ISO*) val="iso${arg:3}";;
+					LATIN*) val="latin${arg:5}";;
+					CYR_1251) val=cp1251;;
+					CYR_ISO88595) val=iso88595;;
+					CYR_ISOIR111) val=isoir111;;
+					CYR_KOI8_R) val=koi8-r;;
+					CYR_KOI8_U) val=koi8-u;;
+					*) err_exit;;
+				esac
+				name="$pref$val"
+				do_CODE
+			;;
+			*) err_exit;;
+		esac
+	done
+}
+
+print_header () {
+	cat <<-_EOF
+	## Makefile fragment for $lang.
+
+	## Copyright (C) 2009, 2010 by Peter Breitenlohner.
+	## 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.
+
+	subdirs += $lang
+	_EOF
+}
+
+print_xdy () {
+	test $# -eq 0 && return
+	printf '\nnobase_nodist_lang_DATA +='
+	for xdy
+	do
+		printf ' \\\n\t'$lang'/%s-lang.xdy' $xdy
+		printf ' \\\n\t'$lang'/%s-test.xdy' $xdy
+		printf ' \\\n\t'$lang'/%s.xdy' $xdy
+	done
+	printf "\n"
+}
+
+print_docs () {
+	test $# -eq 0 && return
+	printf '\nDOCS_%s +=' $DOC
+	printf ' \\\n\t'$lang'/%s-doc.tex' "$@"
+	printf "\n"
+}
+
+print_extra_hdr () {
+	test -n "$print_extra_hdr_done" && return
+	printf '\nEXTRA_DIST +='
+	print_extra_hdr_done=yes
+}
+
+print_extra () {
+	test $# -eq 0 && return
+	print_extra_hdr
+	printf ' \\\n\t%s' "$@"
+}
+
+print_extra_plin () {
+	test $# -eq 0 && return
+	print_extra_hdr
+	printf ' \\\n\t'$lang'/%s.pl.in' "$@"
+}
+
+print_pl () {
+	test $# -eq 0 && return
+	printf '\ndist_noinst_DATA +='
+	printf ' \\\n\t'$lang'/%s.pl' "$@"
+	printf "\n"
+}
+
+print_clean () {
+	test $# -eq 0 && return
+	printf '\nCLEANFILES +='
+	for clean
+	do
+		case $clean in
+			*utf8) printf ' \\\n\t'$lang'/%s.pl' $clean;;
+		esac
+		printf ' \\\n\t'$lang'/%s.raw' $clean
+	done
+	printf "\n"
+}
+
+make_lang () {
+	print_header
+	print_xdy $XDY
+	for DOC in $ALL_DOCS; do
+		eval print_docs \$DOCS_$DOC
+	done
+	print_extra_hdr_done=
+	case $lang in
+		general) PL="$PL template";;
+		klingon) PL="$PL translit-ascii";;
+		test1) PL="$PL test1";;
+		romanian)
+			cat <<\_EOF
+
+romanian/latin2.pl : romanian/utf8.pl.in
+	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
+	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
+_EOF
+			print_extra rom-comma-kludge.sed
+		;;
+	esac
+	print_extra_plin $PLIN
+	test -n "$print_extra_hdr_done" && printf '\n'
+	print_pl $PL
+	print_clean $XDY
+	echo
+}
+
+all_langs () {
+	while read line
+	do
+		parse_lang $line
+		mkdir -p $lang
+		make_lang >$lang/Makefile.tmp
+		if diff $lang/Makefile.tmp $lang/Makefile.am >/dev/null 2>&1; then
+			rm -f $lang/Makefile.tmp
+		else
+			mv -f $lang/Makefile.tmp $lang/Makefile.am
+		fi
+	done
+}
+
+all_langs < lang.defs
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.am
index 24ee78c0ccd..feb84b2755f 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/mongolian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for mongolian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,7 +21,9 @@
 subdirs += mongolian
 
 nobase_nodist_lang_DATA += \
-	mongolian/cyrillic-utf8-lang.xdy mongolian/cyrillic-utf8-test.xdy mongolian/cyrillic-utf8.xdy
+	mongolian/cyrillic-utf8-lang.xdy \
+	mongolian/cyrillic-utf8-test.xdy \
+	mongolian/cyrillic-utf8.xdy
 
 DOCS_UTF8_CYR += \
 	mongolian/cyrillic-utf8-doc.tex
@@ -30,5 +32,6 @@ EXTRA_DIST += \
 	mongolian/cyrillic-utf8.pl.in
 
 CLEANFILES += \
-	mongolian/cyrillic-utf8.pl mongolian/cyrillic-utf8.raw
+	mongolian/cyrillic-utf8.pl \
+	mongolian/cyrillic-utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.am
index 7a64ed3df6c..02a11dc8369 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/norwegian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for norwegian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += norwegian
 
 nobase_nodist_lang_DATA += \
-	norwegian/latin1-lang.xdy norwegian/latin1-test.xdy norwegian/latin1.xdy \
-	norwegian/utf8-lang.xdy norwegian/utf8-test.xdy norwegian/utf8.xdy
+	norwegian/utf8-lang.xdy \
+	norwegian/utf8-test.xdy \
+	norwegian/utf8.xdy \
+	norwegian/latin1-lang.xdy \
+	norwegian/latin1-test.xdy \
+	norwegian/latin1.xdy
 
 DOCS_LATIN1 += \
 	norwegian/latin1-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	norwegian/utf8.pl.in
 
+dist_noinst_DATA += \
+	norwegian/latin1.pl
+
 CLEANFILES += \
-	norwegian/latin1.pl norwegian/latin1.raw \
-	norwegian/utf8.pl norwegian/utf8.raw
+	norwegian/utf8.pl \
+	norwegian/utf8.raw \
+	norwegian/latin1.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.am
index a4a466da72c..b9a0ab1f85c 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/polish/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for polish.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += polish
 
 nobase_nodist_lang_DATA += \
-	polish/cp1250-lang.xdy polish/cp1250-test.xdy polish/cp1250.xdy \
-	polish/latin2-lang.xdy polish/latin2-test.xdy polish/latin2.xdy \
-	polish/utf8-lang.xdy polish/utf8-test.xdy polish/utf8.xdy
+	polish/utf8-lang.xdy \
+	polish/utf8-test.xdy \
+	polish/utf8.xdy \
+	polish/cp1250-lang.xdy \
+	polish/cp1250-test.xdy \
+	polish/cp1250.xdy \
+	polish/latin2-lang.xdy \
+	polish/latin2-test.xdy \
+	polish/latin2.xdy
 
 DOCS_CP1250 += \
 	polish/cp1250-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	polish/utf8.pl.in
 
+dist_noinst_DATA += \
+	polish/cp1250.pl \
+	polish/latin2.pl
+
 CLEANFILES += \
-	polish/cp1250.pl polish/cp1250.raw \
-	polish/latin2.pl polish/latin2.raw \
-	polish/utf8.pl polish/utf8.raw
+	polish/utf8.pl \
+	polish/utf8.raw \
+	polish/cp1250.raw \
+	polish/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.am
index 65b524d5b06..c8d70236200 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/portuguese/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for portuguese.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += portuguese
 
 nobase_nodist_lang_DATA += \
-	portuguese/latin1-lang.xdy portuguese/latin1-test.xdy portuguese/latin1.xdy \
-	portuguese/utf8-lang.xdy portuguese/utf8-test.xdy portuguese/utf8.xdy
+	portuguese/utf8-lang.xdy \
+	portuguese/utf8-test.xdy \
+	portuguese/utf8.xdy \
+	portuguese/latin1-lang.xdy \
+	portuguese/latin1-test.xdy \
+	portuguese/latin1.xdy
 
 DOCS_LATIN1 += \
 	portuguese/latin1-doc.tex
@@ -33,7 +37,11 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	portuguese/utf8.pl.in
 
+dist_noinst_DATA += \
+	portuguese/latin1.pl
+
 CLEANFILES += \
-	portuguese/latin1.pl portuguese/latin1.raw \
-	portuguese/utf8.pl portuguese/utf8.raw
+	portuguese/utf8.pl \
+	portuguese/utf8.raw \
+	portuguese/latin1.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.am
index 24aad4c1806..03f1b3fd326 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/romanian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for romanian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,8 +21,12 @@
 subdirs += romanian
 
 nobase_nodist_lang_DATA += \
-	romanian/latin2-lang.xdy romanian/latin2-test.xdy romanian/latin2.xdy \
-	romanian/utf8-lang.xdy romanian/utf8-test.xdy romanian/utf8.xdy
+	romanian/utf8-lang.xdy \
+	romanian/utf8-test.xdy \
+	romanian/utf8.xdy \
+	romanian/latin2-lang.xdy \
+	romanian/latin2-test.xdy \
+	romanian/latin2.xdy
 
 DOCS_LATIN2 += \
 	romanian/latin2-doc.tex
@@ -30,11 +34,7 @@ DOCS_LATIN2 += \
 DOCS_UTF8_LAT += \
 	romanian/utf8-doc.tex
 
-romanian/cp1250.pl : romanian/utf8.pl
-	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
-	$(CONVERT_FROM_UTF8)CP1250 >$@
-
-romanian/latin2.pl : romanian/utf8.pl
+romanian/latin2.pl : romanian/utf8.pl.in
 	sed -e 's/@u{\([^}]*\)}//g;' -f $(srcdir)/rom-comma-kludge.sed <$< | \
 	$(CONVERT_FROM_UTF8)ISO8859-2 >$@
 
@@ -42,8 +42,11 @@ EXTRA_DIST += \
 	rom-comma-kludge.sed \
 	romanian/utf8.pl.in
 
+dist_noinst_DATA += \
+	romanian/latin2.pl
+
 CLEANFILES += \
-	romanian/cp1250.raw romanian/cp1250.pl \
-	romanian/latin2.pl romanian/latin2.raw \
-	romanian/utf8.pl romanian/utf8.raw
+	romanian/utf8.pl \
+	romanian/utf8.raw \
+	romanian/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.am
index 67df3996204..9a5bd850486 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/russian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for russian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,11 +21,21 @@
 subdirs += russian
 
 nobase_nodist_lang_DATA += \
-	russian/cp1251-lang.xdy russian/cp1251-test.xdy russian/cp1251.xdy \
-	russian/iso88595-lang.xdy russian/iso88595-test.xdy russian/iso88595.xdy \
-	russian/koi8-r-lang.xdy russian/koi8-r-test.xdy russian/koi8-r.xdy \
-	russian/translit-iso-utf8-lang.xdy russian/translit-iso-utf8-test.xdy russian/translit-iso-utf8.xdy \
-	russian/utf8-lang.xdy russian/utf8-test.xdy russian/utf8.xdy
+	russian/utf8-lang.xdy \
+	russian/utf8-test.xdy \
+	russian/utf8.xdy \
+	russian/iso88595-lang.xdy \
+	russian/iso88595-test.xdy \
+	russian/iso88595.xdy \
+	russian/koi8-r-lang.xdy \
+	russian/koi8-r-test.xdy \
+	russian/koi8-r.xdy \
+	russian/cp1251-lang.xdy \
+	russian/cp1251-test.xdy \
+	russian/cp1251.xdy \
+	russian/translit-iso-utf8-lang.xdy \
+	russian/translit-iso-utf8-test.xdy \
+	russian/translit-iso-utf8.xdy
 
 DOCS_CYR_1251 += \
 	russian/cp1251-doc.tex
@@ -43,13 +53,20 @@ DOCS_UTF8_CYR += \
 	russian/utf8-doc.tex
 
 EXTRA_DIST += \
-	russian/translit-iso-utf8.pl.in \
-	russian/utf8.pl.in
+	russian/utf8.pl.in \
+	russian/translit-iso-utf8.pl.in
+
+dist_noinst_DATA += \
+	russian/iso88595.pl \
+	russian/koi8-r.pl \
+	russian/cp1251.pl
 
 CLEANFILES += \
-	russian/cp1251.pl russian/cp1251.raw \
-	russian/iso88595.pl russian/iso88595.raw \
-	russian/koi8-r.pl russian/koi8-r.raw \
-	russian/translit-iso-utf8.pl russian/translit-iso-utf8.raw \
-	russian/utf8.pl russian/utf8.raw
+	russian/utf8.pl \
+	russian/utf8.raw \
+	russian/iso88595.raw \
+	russian/koi8-r.raw \
+	russian/cp1251.raw \
+	russian/translit-iso-utf8.pl \
+	russian/translit-iso-utf8.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.am
index 9e828f50582..3ffd0137f97 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/serbian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for serbian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,10 +21,18 @@
 subdirs += serbian
 
 nobase_nodist_lang_DATA += \
-	serbian/cp1251-lang.xdy serbian/cp1251-test.xdy serbian/cp1251.xdy \
-	serbian/iso88595-lang.xdy serbian/iso88595-test.xdy serbian/iso88595.xdy \
-	serbian/isoir111-lang.xdy serbian/isoir111-test.xdy serbian/isoir111.xdy \
-	serbian/utf8-lang.xdy serbian/utf8-test.xdy serbian/utf8.xdy
+	serbian/utf8-lang.xdy \
+	serbian/utf8-test.xdy \
+	serbian/utf8.xdy \
+	serbian/iso88595-lang.xdy \
+	serbian/iso88595-test.xdy \
+	serbian/iso88595.xdy \
+	serbian/isoir111-lang.xdy \
+	serbian/isoir111-test.xdy \
+	serbian/isoir111.xdy \
+	serbian/cp1251-lang.xdy \
+	serbian/cp1251-test.xdy \
+	serbian/cp1251.xdy
 
 DOCS_CYR_1251 += \
 	serbian/cp1251-doc.tex
@@ -41,9 +49,15 @@ DOCS_UTF8_CYR += \
 EXTRA_DIST += \
 	serbian/utf8.pl.in
 
+dist_noinst_DATA += \
+	serbian/iso88595.pl \
+	serbian/isoir111.pl \
+	serbian/cp1251.pl
+
 CLEANFILES += \
-	serbian/cp1251.pl serbian/cp1251.raw \
-	serbian/iso88595.pl serbian/iso88595.raw \
-	serbian/isoir111.pl serbian/isoir111.raw \
-	serbian/utf8.pl serbian/utf8.raw
+	serbian/utf8.pl \
+	serbian/utf8.raw \
+	serbian/iso88595.raw \
+	serbian/isoir111.raw \
+	serbian/cp1251.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.am
index bedfee08848..9302a395a55 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovak/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for slovak.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,34 +21,54 @@
 subdirs += slovak
 
 nobase_nodist_lang_DATA += \
-	slovak/large-cp1250-lang.xdy slovak/large-cp1250-test.xdy slovak/large-cp1250.xdy \
-	slovak/large-latin2-lang.xdy slovak/large-latin2-test.xdy slovak/large-latin2.xdy \
-	slovak/large-utf8-lang.xdy slovak/large-utf8-test.xdy slovak/large-utf8.xdy \
-	slovak/small-cp1250-lang.xdy slovak/small-cp1250-test.xdy slovak/small-cp1250.xdy \
-	slovak/small-latin2-lang.xdy slovak/small-latin2-test.xdy slovak/small-latin2.xdy \
-	slovak/small-utf8-lang.xdy slovak/small-utf8-test.xdy slovak/small-utf8.xdy
+	slovak/large-utf8-lang.xdy \
+	slovak/large-utf8-test.xdy \
+	slovak/large-utf8.xdy \
+	slovak/large-cp1250-lang.xdy \
+	slovak/large-cp1250-test.xdy \
+	slovak/large-cp1250.xdy \
+	slovak/large-latin2-lang.xdy \
+	slovak/large-latin2-test.xdy \
+	slovak/large-latin2.xdy \
+	slovak/small-utf8-lang.xdy \
+	slovak/small-utf8-test.xdy \
+	slovak/small-utf8.xdy \
+	slovak/small-cp1250-lang.xdy \
+	slovak/small-cp1250-test.xdy \
+	slovak/small-cp1250.xdy \
+	slovak/small-latin2-lang.xdy \
+	slovak/small-latin2-test.xdy \
+	slovak/small-latin2.xdy
 
 DOCS_CP1250 += \
 	slovak/large-cp1250-doc.tex \
 	slovak/small-cp1250-doc.tex
 
 DOCS_LATIN2 += \
-	slovak/small-latin2-doc.tex \
-	slovak/large-latin2-doc.tex
+	slovak/large-latin2-doc.tex \
+	slovak/small-latin2-doc.tex
 
 DOCS_UTF8_LAT += \
-	slovak/small-utf8-doc.tex \
-	slovak/large-utf8-doc.tex
+	slovak/large-utf8-doc.tex \
+	slovak/small-utf8-doc.tex
 
 EXTRA_DIST += \
 	slovak/large-utf8.pl.in \
 	slovak/small-utf8.pl.in
 
+dist_noinst_DATA += \
+	slovak/large-cp1250.pl \
+	slovak/large-latin2.pl \
+	slovak/small-cp1250.pl \
+	slovak/small-latin2.pl
+
 CLEANFILES += \
-	slovak/large-cp1250.pl slovak/large-cp1250.raw \
-	slovak/large-latin2.pl slovak/large-latin2.raw \
-	slovak/large-utf8.pl slovak/large-utf8.raw \
-	slovak/small-cp1250.pl slovak/small-cp1250.raw \
-	slovak/small-latin2.pl slovak/small-latin2.raw \
-	slovak/small-utf8.pl slovak/small-utf8.raw
+	slovak/large-utf8.pl \
+	slovak/large-utf8.raw \
+	slovak/large-cp1250.raw \
+	slovak/large-latin2.raw \
+	slovak/small-utf8.pl \
+	slovak/small-utf8.raw \
+	slovak/small-cp1250.raw \
+	slovak/small-latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.am
index 608558b3bd1..9cc6e0ccba6 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/slovenian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for slovenian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += slovenian
 
 nobase_nodist_lang_DATA += \
-	slovenian/cp1250-lang.xdy slovenian/cp1250-test.xdy slovenian/cp1250.xdy \
-	slovenian/latin2-lang.xdy slovenian/latin2-test.xdy slovenian/latin2.xdy \
-	slovenian/utf8-lang.xdy slovenian/utf8-test.xdy slovenian/utf8.xdy
+	slovenian/utf8-lang.xdy \
+	slovenian/utf8-test.xdy \
+	slovenian/utf8.xdy \
+	slovenian/cp1250-lang.xdy \
+	slovenian/cp1250-test.xdy \
+	slovenian/cp1250.xdy \
+	slovenian/latin2-lang.xdy \
+	slovenian/latin2-test.xdy \
+	slovenian/latin2.xdy
 
 DOCS_CP1250 += \
 	slovenian/cp1250-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	slovenian/utf8.pl.in
 
+dist_noinst_DATA += \
+	slovenian/cp1250.pl \
+	slovenian/latin2.pl
+
 CLEANFILES += \
-	slovenian/cp1250.pl slovenian/cp1250.raw \
-	slovenian/latin2.pl slovenian/latin2.raw \
-	slovenian/utf8.pl slovenian/utf8.raw
+	slovenian/utf8.pl \
+	slovenian/utf8.raw \
+	slovenian/cp1250.raw \
+	slovenian/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.am
index 5cb60a6566e..1609617dadd 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/spanish/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for spanish.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,10 +21,18 @@
 subdirs += spanish
 
 nobase_nodist_lang_DATA += \
-	spanish/modern-latin1-lang.xdy spanish/modern-latin1-test.xdy spanish/modern-latin1.xdy \
-	spanish/modern-utf8-lang.xdy spanish/modern-utf8-test.xdy spanish/modern-utf8.xdy \
-	spanish/traditional-latin1-lang.xdy spanish/traditional-latin1-test.xdy spanish/traditional-latin1.xdy \
-	spanish/traditional-utf8-lang.xdy spanish/traditional-utf8-test.xdy spanish/traditional-utf8.xdy
+	spanish/modern-utf8-lang.xdy \
+	spanish/modern-utf8-test.xdy \
+	spanish/modern-utf8.xdy \
+	spanish/modern-latin1-lang.xdy \
+	spanish/modern-latin1-test.xdy \
+	spanish/modern-latin1.xdy \
+	spanish/traditional-utf8-lang.xdy \
+	spanish/traditional-utf8-test.xdy \
+	spanish/traditional-utf8.xdy \
+	spanish/traditional-latin1-lang.xdy \
+	spanish/traditional-latin1-test.xdy \
+	spanish/traditional-latin1.xdy
 
 DOCS_LATIN1 += \
 	spanish/modern-latin1-doc.tex \
@@ -38,9 +46,15 @@ EXTRA_DIST += \
 	spanish/modern-utf8.pl.in \
 	spanish/traditional-utf8.pl.in
 
+dist_noinst_DATA += \
+	spanish/modern-latin1.pl \
+	spanish/traditional-latin1.pl
+
 CLEANFILES += \
-	spanish/modern-latin1.pl spanish/modern-latin1.raw \
-	spanish/modern-utf8.pl spanish/modern-utf8.raw \
-	spanish/traditional-latin1.pl spanish/traditional-latin1.raw \
-	spanish/traditional-utf8.pl spanish/traditional-utf8.raw
+	spanish/modern-utf8.pl \
+	spanish/modern-utf8.raw \
+	spanish/modern-latin1.raw \
+	spanish/traditional-utf8.pl \
+	spanish/traditional-utf8.raw \
+	spanish/traditional-latin1.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.am
index 03e8449714c..b4b1b5ef781 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/swedish/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for swedish.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += swedish
 
 nobase_nodist_lang_DATA += \
-	swedish/cp1252-lang.xdy swedish/cp1252-test.xdy swedish/cp1252.xdy \
-	swedish/latin9-lang.xdy swedish/latin9-test.xdy swedish/latin9.xdy \
-	swedish/utf8-lang.xdy swedish/utf8-test.xdy swedish/utf8.xdy
+	swedish/utf8-lang.xdy \
+	swedish/utf8-test.xdy \
+	swedish/utf8.xdy \
+	swedish/cp1252-lang.xdy \
+	swedish/cp1252-test.xdy \
+	swedish/cp1252.xdy \
+	swedish/latin9-lang.xdy \
+	swedish/latin9-test.xdy \
+	swedish/latin9.xdy
 
 DOCS_CP1252 += \
 	swedish/cp1252-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	swedish/utf8.pl.in
 
+dist_noinst_DATA += \
+	swedish/cp1252.pl \
+	swedish/latin9.pl
+
 CLEANFILES += \
-	swedish/cp1252.pl swedish/cp1252.raw \
-	swedish/latin9.pl swedish/latin9.raw \
-	swedish/utf8.pl swedish/utf8.raw
+	swedish/utf8.pl \
+	swedish/utf8.raw \
+	swedish/cp1252.raw \
+	swedish/latin9.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.am
index 05dc7580d13..e881a1da72a 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/test1/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for test1.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -20,6 +20,6 @@
 
 subdirs += test1
 
-EXTRA_DIST += \
+dist_noinst_DATA += \
 	test1/test1.pl
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.am
index dc9e257cef4..0c586ff1892 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/turkish/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for turkish.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += turkish
 
 nobase_nodist_lang_DATA += \
-	turkish/latin3-lang.xdy turkish/latin3-test.xdy turkish/latin3.xdy \
-	turkish/latin5-lang.xdy turkish/latin5-test.xdy turkish/latin5.xdy \
-	turkish/utf8-lang.xdy turkish/utf8-test.xdy turkish/utf8.xdy
+	turkish/utf8-lang.xdy \
+	turkish/utf8-test.xdy \
+	turkish/utf8.xdy \
+	turkish/latin3-lang.xdy \
+	turkish/latin3-test.xdy \
+	turkish/latin3.xdy \
+	turkish/latin5-lang.xdy \
+	turkish/latin5-test.xdy \
+	turkish/latin5.xdy
 
 DOCS_LATIN3 += \
 	turkish/latin3-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	turkish/utf8.pl.in
 
+dist_noinst_DATA += \
+	turkish/latin3.pl \
+	turkish/latin5.pl
+
 CLEANFILES += \
-	turkish/latin3.pl turkish/latin3.raw \
-	turkish/latin5.pl turkish/latin5.raw \
-	turkish/utf8.pl turkish/utf8.raw
+	turkish/utf8.pl \
+	turkish/utf8.raw \
+	turkish/latin3.raw \
+	turkish/latin5.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.am
index edc1da4c43c..39005bc448b 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/ukrainian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for ukrainian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += ukrainian
 
 nobase_nodist_lang_DATA += \
-	ukrainian/cp1251-lang.xdy ukrainian/cp1251-test.xdy ukrainian/cp1251.xdy \
-	ukrainian/koi8-u-lang.xdy ukrainian/koi8-u-test.xdy ukrainian/koi8-u.xdy \
-	ukrainian/utf8-lang.xdy ukrainian/utf8-test.xdy ukrainian/utf8.xdy
+	ukrainian/utf8-lang.xdy \
+	ukrainian/utf8-test.xdy \
+	ukrainian/utf8.xdy \
+	ukrainian/koi8-u-lang.xdy \
+	ukrainian/koi8-u-test.xdy \
+	ukrainian/koi8-u.xdy \
+	ukrainian/cp1251-lang.xdy \
+	ukrainian/cp1251-test.xdy \
+	ukrainian/cp1251.xdy
 
 DOCS_CYR_1251 += \
 	ukrainian/cp1251-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_CYR += \
 EXTRA_DIST += \
 	ukrainian/utf8.pl.in
 
+dist_noinst_DATA += \
+	ukrainian/koi8-u.pl \
+	ukrainian/cp1251.pl
+
 CLEANFILES += \
-	ukrainian/cp1251.pl ukrainian/cp1251.raw \
-	ukrainian/koi8-u.pl ukrainian/koi8-u.raw \
-	ukrainian/utf8.pl ukrainian/utf8.raw
+	ukrainian/utf8.pl \
+	ukrainian/utf8.raw \
+	ukrainian/koi8-u.raw \
+	ukrainian/cp1251.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.am
index d3e188512d4..67d91e92ce0 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/upper-sorbian/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for upper-sorbian.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,9 +21,15 @@
 subdirs += upper-sorbian
 
 nobase_nodist_lang_DATA += \
-	upper-sorbian/cp1250-lang.xdy upper-sorbian/cp1250-test.xdy upper-sorbian/cp1250.xdy \
-	upper-sorbian/latin2-lang.xdy upper-sorbian/latin2-test.xdy upper-sorbian/latin2.xdy \
-	upper-sorbian/utf8-lang.xdy upper-sorbian/utf8-test.xdy upper-sorbian/utf8.xdy
+	upper-sorbian/utf8-lang.xdy \
+	upper-sorbian/utf8-test.xdy \
+	upper-sorbian/utf8.xdy \
+	upper-sorbian/cp1250-lang.xdy \
+	upper-sorbian/cp1250-test.xdy \
+	upper-sorbian/cp1250.xdy \
+	upper-sorbian/latin2-lang.xdy \
+	upper-sorbian/latin2-test.xdy \
+	upper-sorbian/latin2.xdy
 
 DOCS_CP1250 += \
 	upper-sorbian/cp1250-doc.tex
@@ -37,8 +43,13 @@ DOCS_UTF8_LAT += \
 EXTRA_DIST += \
 	upper-sorbian/utf8.pl.in
 
+dist_noinst_DATA += \
+	upper-sorbian/cp1250.pl \
+	upper-sorbian/latin2.pl
+
 CLEANFILES += \
-	upper-sorbian/cp1250.pl upper-sorbian/cp1250.raw \
-	upper-sorbian/latin2.pl upper-sorbian/latin2.raw \
-	upper-sorbian/utf8.pl upper-sorbian/utf8.raw
+	upper-sorbian/utf8.pl \
+	upper-sorbian/utf8.raw \
+	upper-sorbian/cp1250.raw \
+	upper-sorbian/latin2.raw
 
diff --git a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.am b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.am
index d2db36776ba..d75cf484baa 100644
--- a/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.am
+++ b/Build/source/utils/xindy-new/xindy/make-rules/alphabets/vietnamese/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile fragment for vietnamese.
 
-## Copyright (C) 2009 by Peter Breitenlohner.
+## Copyright (C) 2009, 2010 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
 ##
 ## This program is free software; you can redistribute it and/or
@@ -21,7 +21,9 @@
 subdirs += vietnamese
 
 nobase_nodist_lang_DATA += \
-	vietnamese/utf8-lang.xdy vietnamese/utf8-test.xdy vietnamese/utf8.xdy
+	vietnamese/utf8-lang.xdy \
+	vietnamese/utf8-test.xdy \
+	vietnamese/utf8.xdy
 
 DOCS_UTF8_LAT += \
 	vietnamese/utf8-doc.tex
@@ -30,5 +32,6 @@ EXTRA_DIST += \
 	vietnamese/utf8.pl.in
 
 CLEANFILES += \
-	vietnamese/utf8.pl vietnamese/utf8.raw
+	vietnamese/utf8.pl \
+	vietnamese/utf8.raw