utils/xindy and texk/tex4htk: Use Makefile fragment for linked scripts

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

74 files changed, 472 insertions, 272 deletions

diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index b2de96d9ea6..51d1bbb7c6f 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use the ../../texk/am/script_links.am fragment
+	to build and install the user commands here.
+
 2011-03-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_CHECK_PERL, KPSE_CHECK_LATEX, and
diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am
index 061d8fd8d28..9e61a2989c9 100644
--- a/Build/source/utils/xindy/Makefile.am
+++ b/Build/source/utils/xindy/Makefile.am
@@ -47,11 +47,30 @@ config.force:
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
 
-bin_PROGRAMS =
-if CLISP_RUNTIME
+perl_scripts = texindy xindy
+scriptsdir = texmf/scripts/xindy
+nodist_bin_SCRIPTS =
+
+include $(srcdir)/../../texk/am/script_links.am
+
+install-data-hook: install-perl-links
+
 install-exec-hook:
+if CLISP_RUNTIME
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) "$(LISP_RUN)" "$(DESTDIR)$(bindir)/$(XINDY_RUN)"
-uninstall-hook:
+endif CLISP_RUNTIME
+
+uninstall-hook: uninstall-links
+if CLISP_RUNTIME
 	rm -f "$(DESTDIR)$(bindir)/$(XINDY_RUN)"
 endif CLISP_RUNTIME
 
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+
+%.pl: $(XINDY_TREE)/user-commands/%.in
+	sed -e 's:@is_TL\@:yes:' $< >$@
+	chmod +x $@
+
+CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
+
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 524403d7bae..288d3cecb27 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -33,22 +33,24 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS =
-subdir = .
 DIST_COMMON = $(am__configure_deps) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
 	$(srcdir)/../../build-aux/install-sh \
-	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
+	$(srcdir)/../../build-aux/missing \
+	$(srcdir)/../../texk/am/script_links.am $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
 	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
+@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(wrappers)
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -56,8 +58,29 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+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)$(bindir)" "$(DESTDIR)$(texmfdir)"
+SCRIPTS = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -228,12 +251,21 @@ EXTRA_DIST = README-clisp $(XINDY_TREE)-PATCHES $(XINDY_TREE)/AUTHORS \
 	$(XINDY_TREE)/make-rules/alphabets/mk-lang.sh
 SUBDIRS = . $(XINDY_TREE)
 DIST_SUBDIRS = $(SUBDIRS)
+perl_scripts = texindy xindy
+scriptsdir = texmf/scripts/xindy
+nodist_bin_SCRIPTS = $(am__append_1)
+all_scripts = $(perl_scripts) $(shell_scripts)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
 all: all-recursive
 
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -265,43 +297,74 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
 	; done
 
-uninstall-binPROGRAMS:
+uninstall-nodist_binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	       sed -e 's,.*/,,;$(transform)'`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+install-nodist_texmfSCRIPTS: $(nodist_texmf_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(texmfdir)" || $(MKDIR_P) "$(DESTDIR)$(texmfdir)"
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \
+	     } \
+	; done
 
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+uninstall-nodist_texmfSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(texmfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(texmfdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -618,10 +681,10 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS) all-local
+all-am: Makefile $(SCRIPTS) all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -641,6 +704,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -649,11 +713,9 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@CLISP_RUNTIME_FALSE@install-exec-hook:
-@CLISP_RUNTIME_FALSE@uninstall-hook:
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -672,13 +734,14 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
-
+install-data-am: install-nodist_texmfSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-nodist_binSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-recursive
@@ -719,29 +782,31 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-nodist_binSCRIPTS \
+	uninstall-nodist_texmfSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-exec-am install-strip tags-recursive \
-	uninstall-am
+	install-am install-data-am install-exec-am install-strip \
+	tags-recursive uninstall-am
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am all-local am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-generic distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-hook
+	clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-hook install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
+	install-html-am install-info install-info-am install-man \
+	install-nodist_binSCRIPTS install-nodist_texmfSCRIPTS \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am uninstall-hook \
+	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS
 
 
 # in case of an SVN repository
@@ -753,11 +818,62 @@ all-local: config.force
 config.force:
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
-@CLISP_RUNTIME_TRUE@install-exec-hook:
+.PHONY: install-perl-links make-perl-links \
+	install-shell-links make-shell-links uninstall-links
+@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
+
+# We support both multiplatform and non-multiplatform builds.
+install-perl-links:
+@WIN32_FALSE@	case "$(bindir)" in \
+@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \
+@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-perl-links;; \
+@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+@WIN32_FALSE@	     exit 1;; \
+@WIN32_FALSE@	esac
+
+install-shell-links:
+@WIN32_FALSE@	case "$(bindir)" in \
+@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-shell-links;; \
+@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-shell-links;; \
+@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+@WIN32_FALSE@	     exit 1;; \
+@WIN32_FALSE@	esac
+
+make-perl-links:
+	@cd $(DESTDIR)$(bindir) && \
+	  for f in $(perl_scripts); do \
+	    rm -f $$f; \
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
+	  done  
+
+make-shell-links:
+	@cd $(DESTDIR)$(bindir) && \
+	  for f in $(shell_scripts); do \
+	    rm -f $$f; \
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \
+	  done
+
+uninstall-links:
+@WIN32_FALSE@	@for f in $(all_scripts); do \
+@WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+@WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+@WIN32_FALSE@	done
+
+install-data-hook: install-perl-links
+
+install-exec-hook:
 @CLISP_RUNTIME_TRUE@	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) "$(LISP_RUN)" "$(DESTDIR)$(bindir)/$(XINDY_RUN)"
-@CLISP_RUNTIME_TRUE@uninstall-hook:
+
+uninstall-hook: uninstall-links
 @CLISP_RUNTIME_TRUE@	rm -f "$(DESTDIR)$(bindir)/$(XINDY_RUN)"
 
+%.pl: $(XINDY_TREE)/user-commands/%.in
+	sed -e 's:@is_TL\@:yes:' $< >$@
+	chmod +x $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/utils/xindy/aclocal.m4 b/Build/source/utils/xindy/aclocal.m4
index ba19668350b..dbd581e6b40 100644
--- a/Build/source/utils/xindy/aclocal.m4
+++ b/Build/source/utils/xindy/aclocal.m4
@@ -991,3 +991,4 @@ AC_SUBST([am__untar])
 
 m4_include([../../m4/kpse-progs.m4])
 m4_include([../../m4/kpse-warnings.m4])
+m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 9443ce332f4..998ca2ed658 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -576,6 +576,10 @@ BUILDRULES_TRUE
 CLISP_RUNTIME_FALSE
 CLISP_RUNTIME_TRUE
 XINDY_TREE
+WIN32_WRAP_FALSE
+WIN32_WRAP_TRUE
+WIN32_FALSE
+WIN32_TRUE
 CONVERT_FROM_UTF8
 LISP_RUN
 XINDY_RUN
@@ -4106,6 +4110,69 @@ done
 echo timestamp >config.force
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef WIN32
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __MINGW32__
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_have_win32=mingw32
+else
+  kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+ if test "x$kpse_cv_have_win32" != xno; then
+  WIN32_TRUE=
+  WIN32_FALSE='#'
+else
+  WIN32_TRUE='#'
+  WIN32_FALSE=
+fi
+
+ if test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe; then
+  WIN32_WRAP_TRUE=
+  WIN32_WRAP_FALSE='#'
+else
+  WIN32_WRAP_TRUE='#'
+  WIN32_WRAP_FALSE=
+fi
+
+
 XINDY_TREE=xindy-2.4
 
 
@@ -4306,6 +4373,14 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+  as_fn_error $? "conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WIN32_WRAP_TRUE}" && test -z "${WIN32_WRAP_FALSE}"; then
+  as_fn_error $? "conditional \"WIN32_WRAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CLISP_RUNTIME_TRUE}" && test -z "${CLISP_RUNTIME_FALSE}"; then
   as_fn_error $? "conditional \"CLISP_RUNTIME\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index f32640411eb..34f74afb855 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -129,6 +129,11 @@ AC_CHECK_FUNCS([strtoul], [],
 echo timestamp >config.force
 fi
 
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+AM_CONDITIONAL([WIN32_WRAP],
+               [test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe])
+
 AC_SUBST([XINDY_TREE], [xindy-]xindy_version)
 
 AM_CONDITIONAL([CLISP_RUNTIME], [test "x$with_clisp_runtime" != xsystem])
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
index d491a3b9670..ae21cc039ca 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-61-detect-TL: For TL the user commands are now built and
+	installed from the top level (proxy) Makefile.
+	* patch-64-symlinks (removed).
+
 2011-03-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-64-do_not_rebuild (new): Do not rebuild the distributed
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL
index 5af187ef561..2c0c67dc807 100644
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL
+++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL
@@ -1,49 +1,43 @@
-diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/user-commands/Makefile.am xindy-2.4/user-commands/Makefile.am
+diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/user-commands/Makefile.am xindy-2.4/user-commands/Makefile.am
 --- xindy-2.4.orig/user-commands/Makefile.am	2010-05-11 01:15:51.000000000 +0200
-+++ xindy-2.4/user-commands/Makefile.am	2010-05-12 21:23:55.000000000 +0200
-@@ -26,12 +26,14 @@
++++ xindy-2.4/user-commands/Makefile.am	2011-03-31 19:05:38.000000000 +0200
+@@ -24,36 +24,7 @@
  
- if TEXLIVE_BUILD
+ bin_SCRIPTS =
  
-+noinst_SCRIPTS = $(scripts)
-+
- scriptspath = texmf/scripts/xindy
- scriptsdir = ${prefix}/$(scriptspath)
- install-exec-hook:
- 	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
- 	@for f in $(scripts); do \
+-if TEXLIVE_BUILD
+-
+-scriptspath = texmf/scripts/xindy
+-scriptsdir = ${prefix}/$(scriptspath)
+-install-exec-hook:
+-	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
+-	@for f in $(scripts); do \
 -	  $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
-+	  $(INSTALL_SCRIPT) $$f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
- 	done
- 	case "$(bindir)" in \
- 	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-@@ -53,17 +55,23 @@
- 	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
- 	done
- 
-+sed_cmd = sed -e 's:@is_TL\@:yes:'
-+
- else !TEXLIVE_BUILD
- 
- bin_SCRIPTS += $(scripts)
- 
-+sed_cmd = sed -e 's:@libdir\@:$(libdir):'
-+
-+endif !TEXLIVE_BUILD
-+
- texindy: texindy.in Makefile
--	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
-+	$(sed_cmd) $(srcdir)/$@.in >$@
-+	chmod +x $@
- 
- xindy: xindy.in Makefile
--	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
+-	done
+-	case "$(bindir)" in \
+-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+-	     exit 1;; \
+-	esac
+-.PHONY: install-links
+-install-links:
+-	@cd "$(DESTDIR)$(bindir)" && \
+-	for f in $(scripts); do \
+-	  rm -f $$f; \
+-	  echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
+-	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
+-	done
+-uninstall-hook:
+-	@for f in $(scripts); do \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+-	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
+-	done
 -
--endif !TEXLIVE_BUILD
-+	$(sed_cmd) $(srcdir)/$@.in >$@
-+	chmod +x $@
+-else !TEXLIVE_BUILD
++if !TEXLIVE_BUILD
  
- man_MANS = texindy.1 xindy.1
+ bin_SCRIPTS += $(scripts)
  
 diff -ur -x Makefile.in -x autom4te.cache xindy-2.4.orig/user-commands/texindy.in xindy-2.4/user-commands/texindy.in
 --- xindy-2.4.orig/user-commands/texindy.in	2010-05-11 01:39:24.000000000 +0200
diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-64-symlinks b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-64-symlinks
deleted file mode 100644
index 65aa6af0bb4..00000000000
--- a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-64-symlinks
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.4.orig/user-commands/Makefile.am xindy-2.4/user-commands/Makefile.am
---- xindy-2.4.orig/user-commands/Makefile.am	2010-05-12 21:23:55.000000000 +0200
-+++ xindy-2.4/user-commands/Makefile.am	2010-12-23 19:32:15.000000000 +0100
-@@ -47,7 +47,7 @@
- 	for f in $(scripts); do \
- 	  rm -f $$f; \
- 	  echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
--	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f; \
-+	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f || exit 1; \
- 	done
- uninstall-hook:
- 	@for f in $(scripts); do \
diff --git a/Build/source/utils/xindy/xindy-2.4/Makefile.in b/Build/source/utils/xindy/xindy-2.4/Makefile.in
index b0928bffaff..0018fa2410f 100644
--- a/Build/source/utils/xindy/xindy-2.4/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/Makefile.in
@@ -47,7 +47,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in b/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in
index 498e3608b22..6ad83d99eb9 100644
--- a/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/doc/Makefile.in
@@ -38,7 +38,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in
index 859af0ab7b9..82c3b3cc4ac 100644
--- a/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/doc/style-tutorial/Makefile.in
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in
index fdaa2c67c75..50c6722523c 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in
index b1777a9f146..259f63b19ff 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/Makefile.in
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in
index 28ef4f7ce00..06f569b7977 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/albanian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in
index 15497d00118..f1195f5b040 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/belarusian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in
index 37957a824d6..243d9f38d01 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/bulgarian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in
index b328bb18d0a..371f7284cdb 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/croatian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in
index 6cd7204590a..e692775fae4 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/czech/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in
index fe9f9eb6193..72843692951 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/danish/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in
index 247e85836df..247c2d1e519 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/dutch/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in
index df325ced6a2..77d0d0cb508 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/english/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in
index 002ecfe5f26..09f3b99c36f 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/esperanto/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in
index 7fe0dbc2a92..3323e0d6e95 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/estonian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in
index 89ce654a1a2..b1537a0b098 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/finnish/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in
index c0a9b447707..d98957b8fe0 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/french/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in
index 2e66a84a0ce..ed768314aed 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/general/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in
index 933f4ca8892..1770ae6c286 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/georgian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in
index 658036672b1..f78c9a20664 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/german/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in
index 8279e227e33..ae853358538 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/greek/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in
index 8e2b2990b22..8cc09c9ccdb 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/gypsy/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in
index 2d38e539e95..6dfde5696b2 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hausa/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in
index 3fd27742a08..f7873e33d8f 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hebrew/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in
index 37f8b59a535..921c69669c6 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/hungarian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in
index 429174f4da3..a730ed357bf 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/icelandic/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in
index 888f9b63e89..15c0836a242 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/italian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in
index fd45b56f1c5..6c63438fb35 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/klingon/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in
index df6a1ea5892..f65171cb088 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/kurdish/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in
index eac92e637e0..7cadc8236e4 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latin/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in
index 298e4abdddc..9d2f58f82c7 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/latvian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in
index 1204799baf0..60342255cfc 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lithuanian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in
index ba55e1446cd..3daa4f98ef2 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/lower-sorbian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in
index 8dd73173a80..a6be7e16b29 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/macedonian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in
index 7dc8d3c91c5..10871f577d1 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/mongolian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in
index 552867a40b1..c74d4792c06 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/norwegian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in
index 16d5cc67c97..0fb14ad0c43 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/polish/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in
index 6ab1291aa11..ba7a2826c14 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/portuguese/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in
index bc967b361c8..2c03392be48 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/romanian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in
index 3d2d56b7874..868d3b2e3fa 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/russian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in
index c6655e7f73b..74566f0e9d3 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/serbian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in
index 262d396ae6d..489f49f02ab 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovak/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in
index 0be5dd9ef06..84964678fd9 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/slovenian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in
index 5a4f565a9a7..c97c29b440f 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/spanish/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in
index bd56fbec64c..44e28ddd965 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/swedish/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in
index ea4f5b99f3d..702caf4bd71 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/test1/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in
index f7f9eaed54f..1d602744143 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/turkish/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in
index 00c900753c7..4932f46cd91 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/ukrainian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in
index 951059b9b87..b2dd446fc32 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/upper-sorbian/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in
index 88f8066a914..2e4e82d6271 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/alphabets/vietnamese/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in
index 4541b473f5d..93e7ecf8e00 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/inputenc/Makefile.in
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in b/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in
index f654f150134..79b81758880 100644
--- a/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/make-rules/styles/Makefile.in
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 2ed35b36242..a3b3fbdbb1c 100644
--- a/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/modules/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 6ca1b19ca69..d9b7ee10777 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
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 504a0c27e5f..0fc7037696f 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
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 6cb6818206a..8d39f0c97e6 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
@@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 8f34fd3c6ea..8ce11b66274 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
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 b56febbc26b..2cba16fbb1f 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
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 bcdefb0a7c7..ff9041488db 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
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 f24b199115a..b5e6cca2149 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
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
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 1c9327d6b77..1dfb6b6341d 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
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/src/Makefile.in b/Build/source/utils/xindy/xindy-2.4/src/Makefile.in
index 9dec8bb4e02..271c946bb50 100644
--- a/Build/source/utils/xindy/xindy-2.4/src/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/src/Makefile.in
@@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in
index 091f7b76f53..b3070275585 100644
--- a/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/tex2xindy/Makefile.in
@@ -39,7 +39,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in tex2xindy.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.am b/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.am
index 09ba93a87ee..26f86a1d719 100644
--- a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.am
+++ b/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.am
@@ -24,54 +24,17 @@ scripts = texindy xindy
 
 bin_SCRIPTS =
 
-if TEXLIVE_BUILD
-
-noinst_SCRIPTS = $(scripts)
-
-scriptspath = texmf/scripts/xindy
-scriptsdir = ${prefix}/$(scriptspath)
-install-exec-hook:
-	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
-	@for f in $(scripts); do \
-	  $(INSTALL_SCRIPT) $$f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
-	done
-	case "$(bindir)" in \
-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-	     exit 1;; \
-	esac
-.PHONY: install-links
-install-links:
-	@cd "$(DESTDIR)$(bindir)" && \
-	for f in $(scripts); do \
-	  rm -f $$f; \
-	  echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
-	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f || exit 1; \
-	done
-uninstall-hook:
-	@for f in $(scripts); do \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
-	done
-
-sed_cmd = sed -e 's:@is_TL\@:yes:'
-
-else !TEXLIVE_BUILD
+if !TEXLIVE_BUILD
 
 bin_SCRIPTS += $(scripts)
 
-sed_cmd = sed -e 's:@libdir\@:$(libdir):'
-
-endif !TEXLIVE_BUILD
-
 texindy: texindy.in Makefile
-	$(sed_cmd) $(srcdir)/$@.in >$@
-	chmod +x $@
+	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
 
 xindy: xindy.in Makefile
-	$(sed_cmd) $(srcdir)/$@.in >$@
-	chmod +x $@
+	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
+
+endif !TEXLIVE_BUILD
 
 man_MANS = texindy.1 xindy.1
 
diff --git a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in b/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in
index 62d736a6b9e..5a4a8b70936 100644
--- a/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.4/user-commands/Makefile.in
@@ -39,7 +39,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/ac/xindy.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/ac/xindy.ac \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,7 +68,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)$(bindir)" "$(DESTDIR)$(man1dir)"
-SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
@@ -183,11 +184,6 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 scripts = texindy xindy
 bin_SCRIPTS = $(am__append_1)
-@TEXLIVE_BUILD_TRUE@noinst_SCRIPTS = $(scripts)
-@TEXLIVE_BUILD_TRUE@scriptspath = texmf/scripts/xindy
-@TEXLIVE_BUILD_TRUE@scriptsdir = ${prefix}/$(scriptspath)
-@TEXLIVE_BUILD_FALSE@sed_cmd = sed -e 's:@libdir\@:$(libdir):'
-@TEXLIVE_BUILD_TRUE@sed_cmd = sed -e 's:@is_TL\@:yes:'
 man_MANS = texindy.1 xindy.1
 EXTRA_DIST = $(man_MANS) texindy.in xindy.in
 CLEANFILES = $(scripts)
@@ -379,8 +375,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@TEXLIVE_BUILD_FALSE@install-exec-hook:
-@TEXLIVE_BUILD_FALSE@uninstall-hook:
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -408,8 +402,7 @@ install-dvi: install-dvi-am
 install-dvi-am:
 
 install-exec-am: install-binSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
 install-html: install-html-am
 
 install-html-am:
@@ -447,57 +440,29 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-man
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-exec-am install-strip uninstall-am
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-binSCRIPTS install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-hook uninstall-man \
-	uninstall-man1
-
-@TEXLIVE_BUILD_TRUE@install-exec-hook:
-@TEXLIVE_BUILD_TRUE@	$(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
-@TEXLIVE_BUILD_TRUE@	@for f in $(scripts); do \
-@TEXLIVE_BUILD_TRUE@	  $(INSTALL_SCRIPT) $$f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
-@TEXLIVE_BUILD_TRUE@	done
-@TEXLIVE_BUILD_TRUE@	case "$(bindir)" in \
-@TEXLIVE_BUILD_TRUE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-@TEXLIVE_BUILD_TRUE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-@TEXLIVE_BUILD_TRUE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@TEXLIVE_BUILD_TRUE@	     exit 1;; \
-@TEXLIVE_BUILD_TRUE@	esac
-@TEXLIVE_BUILD_TRUE@.PHONY: install-links
-@TEXLIVE_BUILD_TRUE@install-links:
-@TEXLIVE_BUILD_TRUE@	@cd "$(DESTDIR)$(bindir)" && \
-@TEXLIVE_BUILD_TRUE@	for f in $(scripts); do \
-@TEXLIVE_BUILD_TRUE@	  rm -f $$f; \
-@TEXLIVE_BUILD_TRUE@	  echo "creating link '$$f' -> '$(REL)/$(scriptspath)/$$f.pl'"; \
-@TEXLIVE_BUILD_TRUE@	  $(LN_S) $(REL)/$(scriptspath)/$$f.pl $$f || exit 1; \
-@TEXLIVE_BUILD_TRUE@	done
-@TEXLIVE_BUILD_TRUE@uninstall-hook:
-@TEXLIVE_BUILD_TRUE@	@for f in $(scripts); do \
-@TEXLIVE_BUILD_TRUE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-@TEXLIVE_BUILD_TRUE@	  rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \
-@TEXLIVE_BUILD_TRUE@	done
-
-texindy: texindy.in Makefile
-	$(sed_cmd) $(srcdir)/$@.in >$@
-	chmod +x $@
-
-xindy: xindy.in Makefile
-	$(sed_cmd) $(srcdir)/$@.in >$@
-	chmod +x $@
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-man uninstall-man1
+
+
+@TEXLIVE_BUILD_FALSE@texindy: texindy.in Makefile
+@TEXLIVE_BUILD_FALSE@	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy
+
+@TEXLIVE_BUILD_FALSE@xindy: xindy.in Makefile
+@TEXLIVE_BUILD_FALSE@	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.