Build system: Use 64-bit Windows wrapper binaries for 64-bit MinGW

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

23 files changed, 136 insertions, 107 deletions

diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog
index 8382f27fd49..f7652601175 100644
--- a/Build/source/utils/m-tx/ChangeLog
+++ b/Build/source/utils/m-tx/ChangeLog
@@ -1,6 +1,10 @@
+2014-11-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Drop KPSE_COND_WIN32_WRAP.
+
 2014-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* m-tx.1 (removed): Maintained under Mastr, not here.
+	* m-tx.1 (removed): Maintained under Master, not here.
 	* Makefile.am: Adjusted.
 
 2013-01-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in
index 57ef25dd9ee..90f1cf2cbbc 100644
--- a/Build/source/utils/m-tx/Makefile.in
+++ b/Build/source/utils/m-tx/Makefile.in
@@ -93,8 +93,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/version.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 \
diff --git a/Build/source/utils/m-tx/aclocal.m4 b/Build/source/utils/m-tx/aclocal.m4
index 084accf15c3..7788d8b5d0a 100644
--- a/Build/source/utils/m-tx/aclocal.m4
+++ b/Build/source/utils/m-tx/aclocal.m4
@@ -1185,4 +1185,3 @@ AC_SUBST([am__untar])
 
 m4_include([../../m4/kpse-common.m4])
 m4_include([../../m4/kpse-warnings.m4])
-m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/utils/m-tx/configure b/Build/source/utils/m-tx/configure
index dec329db232..d0984a130a5 100755
--- a/Build/source/utils/m-tx/configure
+++ b/Build/source/utils/m-tx/configure
@@ -633,10 +633,6 @@ GREP
 CPP
 RANLIB
 LN_S
-WIN32_WRAP_FALSE
-WIN32_WRAP_TRUE
-WIN32_FALSE
-WIN32_TRUE
 WARNING_CFLAGS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -4716,71 +4712,6 @@ 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
-
-
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
@@ -5781,14 +5712,6 @@ 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
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/Build/source/utils/m-tx/configure.ac b/Build/source/utils/m-tx/configure.ac
index 5cf672a5ba0..2767e285260 100644
--- a/Build/source/utils/m-tx/configure.ac
+++ b/Build/source/utils/m-tx/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -18,8 +18,6 @@ KPSE_BASIC([m-tx])
 dnl Check compiler and flags
 AC_PROG_CC
 
-KPSE_COND_WIN32_WRAP
-
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_LN_S
diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog
index 87832e9bb1c..d3b0d433d68 100644
--- a/Build/source/utils/pmx/ChangeLog
+++ b/Build/source/utils/pmx/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Replace KPSE_COND_WIN32_WRAP => KPSE_COND_WIN32.
+
 2014-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pmx2pdf.1 (removed): Maintained under Mastr, not here.
diff --git a/Build/source/utils/pmx/configure b/Build/source/utils/pmx/configure
index 8e07c76e67d..61558985972 100755
--- a/Build/source/utils/pmx/configure
+++ b/Build/source/utils/pmx/configure
@@ -632,8 +632,6 @@ GREP
 CPP
 RANLIB
 LN_S
-WIN32_WRAP_FALSE
-WIN32_WRAP_TRUE
 WIN32_FALSE
 WIN32_TRUE
 PMX_DEFINES
@@ -4745,15 +4743,6 @@ else
 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
-
-
 case $kpse_cv_have_win32 in #(
   native) :
     PMX_DEFINES="$PMX_DEFINES -DMSDOS" ;; #(
@@ -5576,10 +5565,6 @@ 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
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/Build/source/utils/pmx/configure.ac b/Build/source/utils/pmx/configure.ac
index 4130a9561d7..86967e1c173 100644
--- a/Build/source/utils/pmx/configure.ac
+++ b/Build/source/utils/pmx/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -21,7 +21,7 @@ AC_PROG_CC
 dnl initial value for PMX_DEFINES
 AC_SUBST([PMX_DEFINES], ['-DNON_UNIX_STDIO'])
 
-KPSE_COND_WIN32_WRAP
+KPSE_COND_WIN32
 dnl WIN32 has no <sys/times.h>, native WIN32 is as MSDOS
 AS_CASE([$kpse_cv_have_win32],
         [native], [PMX_DEFINES="$PMX_DEFINES -DMSDOS"],
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index 45ae243a04b..977fb41ab0e 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -435,6 +435,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -493,7 +494,7 @@ scriptsdir = texmf-dist/scripts/ps2eps
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_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
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
 texmfdir = $(datarootdir)/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
 CLEANFILES = $(nodist_bin_SCRIPTS)
diff --git a/Build/source/utils/ps2eps/configure b/Build/source/utils/ps2eps/configure
index fbdbfa893dd..6a45d5de78a 100755
--- a/Build/source/utils/ps2eps/configure
+++ b/Build/source/utils/ps2eps/configure
@@ -592,6 +592,7 @@ LIBOBJS
 PS2EPS_TREE
 WIN32_WRAP_FALSE
 WIN32_WRAP_TRUE
+WIN_WRAPPER
 WIN32_FALSE
 WIN32_TRUE
 LN_S
@@ -4449,7 +4450,41 @@ else
 fi
 
 
- if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5
+$as_echo_n "checking for WIN64... " >&6; }
+if ${kpse_cv_have_win64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef _WIN64
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_have_win64=yes
+else
+  kpse_cv_have_win64=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_win64" >&5
+$as_echo "$kpse_cv_have_win64" >&6; }
+case $kpse_cv_have_win64 in #(
+  yes) :
+    WIN_WRAPPER=w64_wrapper ;; #(
+  *) :
+    WIN_WRAPPER=w32_wrapper ;;
+esac
+
+ if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then
   WIN32_WRAP_TRUE=
   WIN32_WRAP_FALSE='#'
 else
diff --git a/Build/source/utils/texdoctk/Makefile.in b/Build/source/utils/texdoctk/Makefile.in
index 64d46ec0e02..2e7ebdef190 100644
--- a/Build/source/utils/texdoctk/Makefile.in
+++ b/Build/source/utils/texdoctk/Makefile.in
@@ -216,6 +216,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -264,7 +265,7 @@ scriptsdir = texmf-dist/scripts/texdoctk
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_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
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
 #
 #
 texmfdir = $(datarootdir)/$(scriptsdir)
diff --git a/Build/source/utils/texdoctk/configure b/Build/source/utils/texdoctk/configure
index 214ac9ff3d4..ffe1bc45faa 100755
--- a/Build/source/utils/texdoctk/configure
+++ b/Build/source/utils/texdoctk/configure
@@ -591,6 +591,7 @@ LTLIBOBJS
 LIBOBJS
 WIN32_WRAP_FALSE
 WIN32_WRAP_TRUE
+WIN_WRAPPER
 WIN32_FALSE
 WIN32_TRUE
 LN_S
@@ -3691,7 +3692,41 @@ else
 fi
 
 
- if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5
+$as_echo_n "checking for WIN64... " >&6; }
+if ${kpse_cv_have_win64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef _WIN64
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_have_win64=yes
+else
+  kpse_cv_have_win64=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_win64" >&5
+$as_echo "$kpse_cv_have_win64" >&6; }
+case $kpse_cv_have_win64 in #(
+  yes) :
+    WIN_WRAPPER=w64_wrapper ;; #(
+  *) :
+    WIN_WRAPPER=w32_wrapper ;;
+esac
+
+ if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then
   WIN32_WRAP_TRUE=
   WIN32_WRAP_FALSE='#'
 else
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index db2decec7f3..4634c32dc4e 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -284,6 +284,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
@@ -349,7 +350,7 @@ scriptsdir = texmf-dist/scripts/xindy
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_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
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
 texmfdir = $(datarootdir)/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
 CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index cc5dce3d9da..487facb72a4 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -598,6 +598,7 @@ CLISP_RUNTIME_TRUE
 XINDY_TREE
 WIN32_WRAP_FALSE
 WIN32_WRAP_TRUE
+WIN_WRAPPER
 WIN32_FALSE
 WIN32_TRUE
 LISP_RUN
@@ -5067,7 +5068,41 @@ else
 fi
 
 
- if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5
+$as_echo_n "checking for WIN64... " >&6; }
+if ${kpse_cv_have_win64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef _WIN64
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_have_win64=yes
+else
+  kpse_cv_have_win64=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_win64" >&5
+$as_echo "$kpse_cv_have_win64" >&6; }
+case $kpse_cv_have_win64 in #(
+  yes) :
+    WIN_WRAPPER=w64_wrapper ;; #(
+  *) :
+    WIN_WRAPPER=w32_wrapper ;;
+esac
+
+ if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then
   WIN32_WRAP_TRUE=
   WIN32_WRAP_FALSE='#'
 else
diff --git a/Build/source/utils/xindy/xindy-2.5.1/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/Makefile.in
index 477ad26c51d..9d91ba8bbd2 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/Makefile.in
@@ -263,6 +263,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in
index 36daf1bed30..3a321148e87 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in
@@ -195,6 +195,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in
index d5cf8d4b567..6476a43c7d5 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in
@@ -224,6 +224,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in
index 027d5aa179b..078ceec8221 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in
@@ -221,6 +221,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in
index 8675d639774..0db63b3c54a 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in
@@ -194,6 +194,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in
index edffbd642de..51da8b123dc 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in
@@ -199,6 +199,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in
index 73098f10481..449a6c8a93d 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in
@@ -194,6 +194,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in
index a39a1543f3f..69ba8343de1 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in
@@ -244,6 +244,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in
index 452e14f112f..691b846b94d 100644
--- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in
@@ -198,6 +198,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WIN_WRAPPER = @WIN_WRAPPER@
 XINDY_RUN = @XINDY_RUN@
 XINDY_TREE = @XINDY_TREE@
 abs_builddir = @abs_builddir@