reorganize xindy-2.4 build system (part 2)

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

9 files changed, 45 insertions, 45 deletions

diff --git a/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
index dc6768d4259..f11da4b50a3 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
@@ -32,12 +32,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules
+subdir = xindy-2.4/modules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -141,6 +140,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -205,9 +205,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in
index 605c6bc801a..3fdaf0b0184 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/base/Makefile.in
@@ -33,12 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/base
+subdir = xindy-2.4/modules/base
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -125,6 +124,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -211,9 +211,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/base/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/base/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/base/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/base/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in
index 5d0ffd0edd8..420236f96a3 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/class/Makefile.in
@@ -33,12 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/class
+subdir = xindy-2.4/modules/class
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -125,6 +124,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -195,9 +195,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/class/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/class/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/class/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/class/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in
index 933dd3dd25d..9e70c20af60 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/Makefile.in
@@ -32,12 +32,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/lang
+subdir = xindy-2.4/modules/lang
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -141,6 +140,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -205,9 +205,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/lang/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/lang/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/lang/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/lang/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in
index 04b25f1209a..0154c6e6e5d 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/german/Makefile.in
@@ -33,12 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/lang/german
+subdir = xindy-2.4/modules/lang/german
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -125,6 +124,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -197,9 +197,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/lang/german/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/lang/german/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/lang/german/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/lang/german/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in
index 41d2a274bea..07817b58a93 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/lang/latin/Makefile.in
@@ -33,12 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/lang/latin
+subdir = xindy-2.4/modules/lang/latin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -125,6 +124,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -196,9 +196,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/lang/latin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/lang/latin/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/lang/latin/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/lang/latin/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in
index 4c487763592..0601d628722 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/ord/Makefile.in
@@ -33,12 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/ord
+subdir = xindy-2.4/modules/ord
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -125,6 +124,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -195,9 +195,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/ord/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/ord/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/ord/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/ord/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in
index 52088f956ea..d1fffeb07b0 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/rules/Makefile.in
@@ -33,12 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/rules
+subdir = xindy-2.4/modules/rules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -125,6 +124,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -198,9 +198,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/rules/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/rules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/rules/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/rules/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in b/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in
index c99e0fe81e3..5042d3ce28c 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/styles/Makefile.in
@@ -33,12 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = xindy/modules/styles
+subdir = xindy-2.4/modules/styles
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -125,6 +124,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 XINDY_RUN = @XINDY_RUN@
+XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -193,9 +193,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy/modules/styles/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xindy-2.4/modules/styles/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign xindy/modules/styles/Makefile
+	  $(AUTOMAKE) --foreign xindy-2.4/modules/styles/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \