autoreconf

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

12 files changed, 26 insertions, 61 deletions

diff --git a/Build/source/utils/xindy/binaries/Makefile.in b/Build/source/utils/xindy/binaries/Makefile.in
index b9fbe8a205f..9513935fef9 100644
--- a/Build/source/utils/xindy/binaries/Makefile.in
+++ b/Build/source/utils/xindy/binaries/Makefile.in
@@ -162,13 +162,8 @@ top_srcdir = @top_srcdir@
 # some global variables
 SRCDIR = $(top_srcdir)/src
 FAS = base.fas locref.fas idxstyle.fas index.fas version.fas markup.fas
-DEFAULTS = defaults.xdy
 DUMP_XINDY = $(SRCDIR)/dump-xindy.lsp
-MEMFILE = xindy.mem
 RUN_XINDY = ./$(XINDY_RUN) -q -norc -M ./base.mem
-# Where the modules are found at runtime.
-@TETEX_BUILD_FALSE@MODULEDIR = $(pkgdatadir)
-@TETEX_BUILD_TRUE@MODULEDIR = $(prefix)/texmf/xindy
 # Where the files xindy.run and xindy.mem should be installed.
 @TETEX_BUILD_FALSE@kerneldir = $(pkglibdir)
 @TETEX_BUILD_TRUE@kerneldir = $(bindir)
@@ -381,19 +376,18 @@ uninstall-am: uninstall-kernelDATA uninstall-kernelSCRIPTS
 	uninstall-kernelDATA uninstall-kernelSCRIPTS
 
 
-xindy.mem: $(DEFAULTS) $(FAS) base.mem $(XINDY_RUN)
-	rm -f $(MEMFILE)
+xindy.mem: defaults.xdy $(FAS) base.mem $(XINDY_RUN)
+	rm -f $@
 	$(RUN_XINDY) -x '(load "$(DUMP_XINDY)")'
-	gzip $(MEMFILE)
-	mv $(MEMFILE).gz $(MEMFILE)
-
-$(DEFAULTS):
-	@$(RM) $(DEFAULTS)
-	@echo "Creating file $(DEFAULTS)..."
-	@echo "(setq *load-paths* (list "         > $(DEFAULTS)
-	@echo "  (pathname \".\")"               >> $(DEFAULTS)
-	@echo "  (pathname \"$(MODULEDIR)\")))"  >> $(DEFAULTS)
-	@echo "Finished $(DEFAULTS)."
+	test "$(host_os)" != "mingw32" && gzip -9n $@ && mv $@.gz $@
+
+defaults.xdy:
+	@$(RM) $@
+	@echo "Creating file $@ ..."
+	@echo "(setq *load-paths* (list "         > $@
+	@echo "  (pathname \".\")"               >> $@
+	@echo "  (pathname \"$(pkgdatadir)\")))" >> $@
+	@echo "Finished $@."
 
 %.fas: $(SRCDIR)/%.lsp
 	$(RUN_XINDY) -c $< -o $@
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 0b6d86a95b7..fbd0e2184d2 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -3706,6 +3706,7 @@ fi
 if test "x$enable_tetex_build" = xyes; then
   { echo "$as_me:$LINENO: Using installation layout for TeX Live" >&5
 echo "$as_me: Using installation layout for TeX Live" >&6;}
+  datadir="$prefix/texmf"
   docdir="$prefix/texmf/doc/$PACKAGE_NAME"
   mandir="$prefix/texmf/doc/man"
   if test -z "$enable_docs"; then
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
index aac760bc703..61a68dfe764 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
@@ -255,8 +255,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@langdir = $(pkgdatadir)/lang
-@TETEX_BUILD_TRUE@langdir = $(prefix)/texmf/xindy/lang
+langdir = $(pkgdatadir)/lang
 albaniandir = $(langdir)/albanian
 ALBANIAN = \
 	albanian/latin1-lang.xdy \
diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
index afffe68c7bb..06d4360c4df 100644
--- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
@@ -155,9 +155,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
-@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/xindy
-inputencdir = $(modulesdir)/tex/inputenc
+inputencdir = $(pkgdatadir)/tex/inputenc
 INPUTENCS = \
 	cp1250.xdy \
 	cp1251.xdy \
diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in
index 74c66a6ebc1..d322d67e51e 100644
--- a/Build/source/utils/xindy/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in
@@ -155,9 +155,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
-@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/xindy
-stylesdir = $(modulesdir)/styles
+stylesdir = $(pkgdatadir)/styles
 STYLES = \
 	example.xdy \
 	makeindex.xdy \
diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in
index d355f5e82ca..2fd7793b938 100644
--- a/Build/source/utils/xindy/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/modules/base/Makefile.in
@@ -155,9 +155,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
-@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/xindy
-basedir = $(modulesdir)/base
+basedir = $(pkgdatadir)/base
 RULES = \
 	book-order.xdy \
 	ff-ranges-only.xdy \
diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in
index f38c0b68b6f..bc27badc99b 100644
--- a/Build/source/utils/xindy/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/modules/class/Makefile.in
@@ -155,12 +155,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
-@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/xindy
-classdir = $(modulesdir)/class
-RULES = \
-	pagenums.xdy
-
+classdir = $(pkgdatadir)/class
+RULES = pagenums.xdy
 EXTRA_DIST = $(RULES)
 class_DATA = $(RULES)
 all: all-am
diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in
index 2d75e999b52..da7e5e83cb9 100644
--- a/Build/source/utils/xindy/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in
@@ -155,14 +155,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@langdir = $(pkgdatadir)/lang
-@TETEX_BUILD_TRUE@langdir = $(prefix)/texmf/xindy/lang
-germandir = $(langdir)/german
-RULES = \
-	din5007.xdy \
-	duden.xdy \
-	tex.xdy
-
+germandir = $(pkgdatadir)/lang/german
+RULES = din5007.xdy duden.xdy tex.xdy
 EXTRA_DIST = $(RULES)
 german_DATA = $(RULES)
 all: all-am
diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
index 69a20e904fb..d678f6fd8b1 100644
--- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
@@ -155,13 +155,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@langdir = $(pkgdatadir)/lang
-@TETEX_BUILD_TRUE@langdir = $(prefix)/texmf/xindy/lang
-latindir = $(langdir)/latin
-RULES = \
-	caseisrt.xdy \
-	letgroup.xdy
-
+latindir = $(pkgdatadir)/lang/latin
+RULES = caseisrt.xdy letgroup.xdy
 EXTRA_DIST = $(RULES)
 latin_DATA = $(RULES)
 all: all-am
diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in
index 2f45694f0a5..16d4ad784a5 100644
--- a/Build/source/utils/xindy/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/modules/ord/Makefile.in
@@ -155,12 +155,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
-@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/xindy
-orddir = $(modulesdir)/ord
-RULES = \
-	letorder.xdy
-
+orddir = $(pkgdatadir)/ord
+RULES = letorder.xdy
 EXTRA_DIST = $(RULES)
 ord_DATA = $(RULES)
 all: all-am
diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in
index 830e1ea1bef..db5dc146478 100644
--- a/Build/source/utils/xindy/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/modules/rules/Makefile.in
@@ -155,9 +155,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
-@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/xindy
-rulesdir = $(modulesdir)/rules
+rulesdir = $(pkgdatadir)/rules
 RULES = \
 	isolatin1-exchange.xdy \
 	latin-exchange.xdy \
diff --git a/Build/source/utils/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/modules/styles/Makefile.in
index ce9229c379f..02fa2104c43 100644
--- a/Build/source/utils/xindy/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/modules/styles/Makefile.in
@@ -155,9 +155,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
-@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/xindy
-texdir = $(modulesdir)/styles
+texdir = $(pkgdatadir)/styles
 RULES = basic.xdy makeidx.xdy
 EXTRA_DIST = $(RULES)
 tex_DATA = $(RULES)