minor build system fixes

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

17 files changed, 89 insertions, 55 deletions

diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index d63d04ab0d0..1db5c9c8882 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (ft-libs): Use '--libtool' instead of '--libs'.
+
 2009-12-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Replace the obsolete $(mkdir_p) by $(MKDIR_P).
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 45af7db4fe4..c94401a4bcd 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -56,7 +56,7 @@ libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) install
 	ft-install/bin/freetype-config --cflags >ft-includes
-	ft-install/bin/freetype-config --libs >ft-libs
+	ft-install/bin/freetype-config --libtool >ft-libs
 	sleep 1
 	@for f in libfreetype.*; do touch $$f; done
 
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index 96349bfdf8f..f9351605302 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -497,7 +497,7 @@ libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) install
 	ft-install/bin/freetype-config --cflags >ft-includes
-	ft-install/bin/freetype-config --libs >ft-libs
+	ft-install/bin/freetype-config --libtool >ft-libs
 	sleep 1
 	@for f in libfreetype.*; do touch $$f; done
 
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 1e38c2f54f2..90732783d10 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (install-links): Avoid dangling man symlink.
+
 2009-12-16  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (nobase_dist_script_SCRIPTS): .pl for latexrevise
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 19cb9fef659..3fd67f5c777 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -155,8 +155,10 @@ install-links:
 	    $(LN_S) $$file $$link; \
 	  done && \
 	  rm -f man && \
-	  echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
-	  (ln -s $(REL)/texmf/doc/man man || :)
+	  if test -d $(REL)/texmf/doc/man; then \
+	    echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+	    (ln -s $(REL)/texmf/doc/man man || :); \
+	  else :; fi
 ## man dir link for those mans which can use it.
 
 uninstall-hook:
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index a89091550b7..a184f537d42 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -608,8 +608,10 @@ install-links:
 	    $(LN_S) $$file $$link; \
 	  done && \
 	  rm -f man && \
-	  echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
-	  (ln -s $(REL)/texmf/doc/man man || :)
+	  if test -d $(REL)/texmf/doc/man; then \
+	    echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+	    (ln -s $(REL)/texmf/doc/man man || :); \
+	  else :; fi
 
 uninstall-hook:
 	@for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \
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 a9a55d336ca..3b0b52e8b1f 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
@@ -20,7 +20,7 @@ Removed:
 	modules/*/{,*/}Makefile.{am,in}
 
 Removed:
-	make-rules/alphabets/*/*.xdy
+	make-rules/alphabets/*/*.pl
 except
 	make-rules/alphabets/general/template.pl
 	make-rules/alphabets/klingon/translit-ascii.pl
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 13251d83240..9fabe90cec0 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
@@ -69,8 +69,8 @@ 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	2009-12-17 19:57:46.000000000 +0100
-@@ -21,787 +21,86 @@
++++ xindy/make-rules/alphabets/Makefile.am	2010-01-10 18:40:52.000000000 +0100
+@@ -21,787 +21,88 @@
  
  langdir	= $(pkglibdir)/modules/lang
  
@@ -872,7 +872,9 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
 +DOCS_CYR_KOI8_R =
 +DOCS_CYR_KOI8_U =
 +
-+DOCS_OTHER =
++DOCS_ISO88597 =
++DOCS_ISO88598 =
++
 +DOCS_UTF8_LAT =
 +DOCS_UTF8_CYR =
 +DOCS_UTF8_OTHER =
@@ -937,7 +939,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 +113,6 @@
+@@ -814,13 +115,6 @@
  	sed -e 's/@.{\([^}]*\)}//g;' <$< | \
  	$(CONVERT_FROM_UTF8)CP850 >$@
  
@@ -951,7 +953,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 +145,6 @@
+@@ -853,13 +147,6 @@
  	sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}/\1/g;' <$< | \
  	$(CONVERT_FROM_UTF8)ISO-8859-15 >$@
  
@@ -965,7 +967,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 +196,11 @@
+@@ -911,203 +198,11 @@
  	  fi; \
  	fi
  
@@ -1169,7 +1171,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 +208,6 @@
+@@ -1115,72 +210,6 @@
  	$(DOCS_CYR_KOI8_R) \
  	$(DOCS_CYR_KOI8_U)
  
@@ -1242,7 +1244,18 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/Makefi
  DOCS_CPS = \
  	$(DOCS_CP1250) \
  	$(DOCS_CP1252) \
-@@ -1270,7 +297,7 @@
+@@ -1194,6 +223,10 @@
+ 	$(DOCS_LATIN5) \
+ 	$(DOCS_LATIN9)
+ 
++DOCS_OTHER = \
++	$(DOCS_ISO88597) \
++	$(DOCS_ISO88598)
++
+ DOCS_UTF8 = \
+ 	$(DOCS_UTF8_LAT) \
+ 	$(DOCS_UTF8_CYR) \
+@@ -1270,7 +303,7 @@
  	alphabets-inc.tex \
  	alphabets-doc.toc
  
@@ -1356,7 +1369,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/belaru
  
 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	2009-12-17 20:43:40.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.
@@ -1367,19 +1380,13 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/bulgar
  ## Copyright (C) 2004-2005 by Gour.
  ##
  ## This program is free software; you can redistribute it and/or
-@@ -19,19 +18,33 @@
+@@ -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
-+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
- 
+-
+-
 -CLEANFILES = \
 -	cp1251.raw \
 -	cp1251-doc.tex \
@@ -1389,22 +1396,31 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/bulgar
 -	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 \
@@ -1920,12 +1936,12 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/genera
  
 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	2009-12-17 20:55:26.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 .
++## Makefile fragment for georgian.
  
 +## Copyright (C) 2009 by Peter Breitenlohner.
  ## Copyright (C) 2004-2005 by Gour.
@@ -2022,7 +2038,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/german
  
 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	2009-12-17 21:02:59.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.
@@ -2033,7 +2049,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/greek/
  ## Copyright (C) 2004-2005 by Gour.
  ##
  ## This program is free software; you can redistribute it and/or
-@@ -19,24 +18,39 @@
+@@ -19,24 +18,38 @@
  ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  ## Boston, MA 02110-1301 USA.
  
@@ -2068,7 +2084,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/greek/
 +DOCS_LATIN4 += \
 +	greek/translit-latin4-doc.tex
 +
-+DOCS_OTHER += \
++DOCS_ISO88597 += \
 +	greek/iso88597-doc.tex
 +
 +DOCS_UTF8_LAT += \
@@ -2084,7 +2100,6 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/greek/
 +	greek/translit-utf8.pl.in \
 +	greek/utf8.pl.in
 +
-+
 +CLEANFILES += \
 +	greek/iso88597.pl greek/iso88597.raw \
 +	greek/polytonic-utf8.pl greek/polytonic-utf8.raw \
@@ -2164,7 +2179,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hausa/
  
 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	2009-12-17 21:03:49.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.
@@ -2191,7 +2206,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/hebrew
 +	hebrew/iso88598-lang.xdy hebrew/iso88598-test.xdy hebrew/iso88598.xdy \
 +	hebrew/utf8-lang.xdy hebrew/utf8-test.xdy hebrew/utf8.xdy
  
-+DOCS_OTHER += \
++DOCS_ISO88598 += \
 +	hebrew/iso88598-doc.tex
  
 +DOCS_UTF8_OTHER += \
@@ -2348,7 +2363,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/italia
  
 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	2009-12-17 21:28:22.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.
@@ -2359,7 +2374,7 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/klingo
  ## Copyright (C) 2004-2005 by Gour.
  ##
  ## This program is free software; you can redistribute it and/or
-@@ -19,15 +18,21 @@
+@@ -19,15 +18,20 @@
  ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  ## Boston, MA 02110-1301 USA.
  
@@ -2383,10 +2398,9 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/klingo
 +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
@@ -2566,12 +2580,12 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/lithua
  
 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	2009-12-17 21:09:55.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 .
++## Makefile fragment for lower-sorbian.
  
 +## Copyright (C) 2009 by Peter Breitenlohner.
  ## Copyright (C) 2004-2005 by Gour.
@@ -3379,12 +3393,12 @@ diff -ur -x Makefile.in -x autom4te.cache xindy.orig/make-rules/alphabets/ukrain
  
 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	2009-12-17 21:24:19.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 .
++## Makefile fragment for upper-sorbian.
  
 +## Copyright (C) 2009 by Peter Breitenlohner.
  ## Copyright (C) 2004-2005 by Gour.
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 2065c2d3585..17e00b23109 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
@@ -39,7 +39,9 @@ DOCS_CYR_ISOIR111 =
 DOCS_CYR_KOI8_R =
 DOCS_CYR_KOI8_U =
 
-DOCS_OTHER =
+DOCS_ISO88597 =
+DOCS_ISO88598 =
+
 DOCS_UTF8_LAT =
 DOCS_UTF8_CYR =
 DOCS_UTF8_OTHER =
@@ -221,6 +223,10 @@ DOCS_LAT = \
 	$(DOCS_LATIN5) \
 	$(DOCS_LATIN9)
 
+DOCS_OTHER = \
+	$(DOCS_ISO88597) \
+	$(DOCS_ISO88598)
+
 DOCS_UTF8 = \
 	$(DOCS_UTF8_LAT) \
 	$(DOCS_UTF8_CYR) \
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 7e8df296334..4adfb959d33 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
@@ -424,7 +424,8 @@ DOCS_CYR_ISOIR111 = belarusian/isoir111-doc.tex \
 	macedonian/isoir111-doc.tex serbian/isoir111-doc.tex
 DOCS_CYR_KOI8_R = bulgarian/koi8-r-doc.tex russian/koi8-r-doc.tex
 DOCS_CYR_KOI8_U = ukrainian/koi8-u-doc.tex
-DOCS_OTHER = greek/iso88597-doc.tex hebrew/iso88598-doc.tex
+DOCS_ISO88597 = greek/iso88597-doc.tex
+DOCS_ISO88598 = hebrew/iso88598-doc.tex
 DOCS_UTF8_LAT = albanian/utf8-doc.tex croatian/utf8-doc.tex \
 	czech/utf8-doc.tex danish/utf8-doc.tex \
 	dutch/ij-as-ij-utf8-doc.tex dutch/ij-as-y-utf8-doc.tex \
@@ -608,6 +609,10 @@ DOCS_LAT = \
 	$(DOCS_LATIN5) \
 	$(DOCS_LATIN9)
 
+DOCS_OTHER = \
+	$(DOCS_ISO88597) \
+	$(DOCS_ISO88598)
+
 DOCS_UTF8 = \
 	$(DOCS_UTF8_LAT) \
 	$(DOCS_UTF8_CYR) \
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 9b8483a17fe..2066dbaa90e 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
@@ -41,7 +41,6 @@ DOCS_UTF8_CYR += \
 EXTRA_DIST += \
 	bulgarian/utf8.pl.in
 
-
 CLEANFILES += \
 	bulgarian/cp1251.pl bulgarian/cp1251.raw \
 	bulgarian/iso88595.pl bulgarian/iso88595.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 f2fa9c924e1..0db970e5e44 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,4 +1,4 @@
-## Makefile fragment for .
+## Makefile fragment for georgian.
 
 ## Copyright (C) 2009 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
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 78aca45c658..322b9f0fb70 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
@@ -30,7 +30,7 @@ nobase_nodist_lang_DATA += \
 DOCS_LATIN4 += \
 	greek/translit-latin4-doc.tex
 
-DOCS_OTHER += \
+DOCS_ISO88597 += \
 	greek/iso88597-doc.tex
 
 DOCS_UTF8_LAT += \
@@ -46,7 +46,6 @@ EXTRA_DIST += \
 	greek/translit-utf8.pl.in \
 	greek/utf8.pl.in
 
-
 CLEANFILES += \
 	greek/iso88597.pl greek/iso88597.raw \
 	greek/polytonic-utf8.pl greek/polytonic-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 d2660d88fa0..8e573d0530b 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
@@ -24,7 +24,7 @@ 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_OTHER += \
+DOCS_ISO88598 += \
 	hebrew/iso88598-doc.tex
 
 DOCS_UTF8_OTHER += \
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 1fb139988ca..fc4e016f6b1 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
@@ -32,7 +32,6 @@ EXTRA_DIST += \
 EXTRA_DIST += \
 	klingon/translit-ascii.pl
 
-
 CLEANFILES += \
 	klingon/utf8.pl klingon/utf8.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 568f97bb717..380c5997a4c 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,4 +1,4 @@
-## Makefile fragment for .
+## Makefile fragment for lower-sorbian.
 
 ## Copyright (C) 2009 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.
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 5826349683e..d3e188512d4 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,4 +1,4 @@
-## Makefile fragment for .
+## Makefile fragment for upper-sorbian.
 
 ## Copyright (C) 2009 by Peter Breitenlohner.
 ## Copyright (C) 2004-2005 by Gour.