debian patches from xindy_2.3-1 patched Makefile.in files but forgot to patch the corresponding Makefile.am files

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

9 files changed, 13 insertions, 13 deletions

diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
index 490522508c3..8c1521f58b5 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-langdir	= $(pkglibdir)/modules/lang
+langdir	= $(pkgdatadir)/lang
 
 albaniandir = $(langdir)/albanian
 
@@ -1132,7 +1132,7 @@ alphabets-inc.tex : $(DOCS)
 	echo "\section{Codepage latin9}" >>$@
 	for i in $(DOCS_LATIN9); do echo "\input{$$i}" >>$@; done
 	echo "\ienc{cp1251}" >>$@
-	echo "\fenc{T2A}" >>$@
+	printf "%s\n" "\fenc{T2A}" >>$@
 	echo "\chapter{Cyrillic scripts}" >>$@
 	echo "\section{Codepage 1251}" >>$@
 	for i in $(DOCS_CYR_1251); do echo "\input{$$i}" >>$@; done
@@ -1150,8 +1150,8 @@ if BUILDRULES
 
 if BUILDDOCS
 alphabets-doc.pdf : alphabets-doc.tex alphabets-inc.tex
-	pdflatex alphabets-doc.tex
-	pdflatex alphabets-doc.tex
+	pdflatex -interaction batchmode alphabets-doc.tex
+	pdflatex -interaction batchmode alphabets-doc.tex
 
 docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
 
diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am
index 89ad78ebb03..468897b6f48 100644
--- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.am
+++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
 
 inputencdir = $(modulesdir)/tex/inputenc
 
@@ -47,7 +47,7 @@ latin.xdy : latin1.xdy latin2.xdy latin3.xdy
 
 %.xdy %.idx :
 	perl ./make-testidx.pl TS1,T2A,T1 $* >$*.tex
-	latex $*.tex
+	latex -interaction batchmode $*.tex
 	perl ./make-inp-rules.pl <$*.idx >$*.xdy
 
 PERLSCRIPTS = \
diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.am b/Build/source/utils/xindy/make-rules/styles/Makefile.am
index 19694da2b84..33f8f48ac5d 100644
--- a/Build/source/utils/xindy/make-rules/styles/Makefile.am
+++ b/Build/source/utils/xindy/make-rules/styles/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
 
 stylesdir = $(modulesdir)/styles
 
diff --git a/Build/source/utils/xindy/modules/base/Makefile.am b/Build/source/utils/xindy/modules/base/Makefile.am
index d49e9ea1f95..42220d6ab42 100644
--- a/Build/source/utils/xindy/modules/base/Makefile.am
+++ b/Build/source/utils/xindy/modules/base/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
 
 basedir = $(modulesdir)/base
 
diff --git a/Build/source/utils/xindy/modules/class/Makefile.am b/Build/source/utils/xindy/modules/class/Makefile.am
index e0483de723e..a83d7f9d02b 100644
--- a/Build/source/utils/xindy/modules/class/Makefile.am
+++ b/Build/source/utils/xindy/modules/class/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
 
 classdir = $(modulesdir)/class
 
diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.am b/Build/source/utils/xindy/modules/lang/german/Makefile.am
index 99720f5c617..534bb1ccbac 100644
--- a/Build/source/utils/xindy/modules/lang/german/Makefile.am
+++ b/Build/source/utils/xindy/modules/lang/german/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-langdir = $(pkglibdir)/modules/lang
+langdir = $(pkgdatadir)/lang
 
 germandir = $(langdir)/german
 
diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.am b/Build/source/utils/xindy/modules/lang/latin/Makefile.am
index 6aaf456054f..fa4a5d9fe91 100644
--- a/Build/source/utils/xindy/modules/lang/latin/Makefile.am
+++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-langdir = $(pkglibdir)/modules/lang
+langdir = $(pkgdatadir)/lang
 
 latindir = $(langdir)/latin
 
diff --git a/Build/source/utils/xindy/modules/ord/Makefile.am b/Build/source/utils/xindy/modules/ord/Makefile.am
index a903f63bdce..47138a6a333 100644
--- a/Build/source/utils/xindy/modules/ord/Makefile.am
+++ b/Build/source/utils/xindy/modules/ord/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
 
 orddir = $(modulesdir)/ord
 
diff --git a/Build/source/utils/xindy/modules/rules/Makefile.am b/Build/source/utils/xindy/modules/rules/Makefile.am
index 8848621f8ac..98bf7a7fd29 100644
--- a/Build/source/utils/xindy/modules/rules/Makefile.am
+++ b/Build/source/utils/xindy/modules/rules/Makefile.am
@@ -19,7 +19,7 @@
 ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ## Boston, MA 02110-1301 USA.
 
-modulesdir = $(pkglibdir)/modules
+modulesdir = $(pkgdatadir)
 
 rulesdir = $(modulesdir)/rules