Build and install WIN32/MINGW32 wrapper binaries

   where Unix uses symlinks such as dvilj6->dvilj4

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

25 files changed, 634 insertions, 212 deletions

diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index 7ca16bbde81..94db9765151 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am [WIN32]: Add dvilj6.exe wrapper.
+
 2011-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use ../am/man1_links.am for manpage links.
diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am
index 58ee1dd8476..5db79bef48a 100644
--- a/Build/source/texk/dviljk/Makefile.am
+++ b/Build/source/texk/dviljk/Makefile.am
@@ -17,12 +17,14 @@ libdvilj_a_SOURCES = \
 
 $(libdvilj_a_OBJECTS): $(KPATHSEA_DEPEND)
 
-if !WIN32
+bin_PROGRAMS = dvilj dvilj2p dvilj4 dvilj4l
+
+if WIN32
+bin_PROGRAMS += dvilj6
+else !WIN32
 dist_bin_SCRIPTS = dvihp
 endif !WIN32
 
-bin_PROGRAMS = dvilj dvilj2p dvilj4 dvilj4l
-
 dvilj_CPPFLAGS = -DKPATHSEA -DLJ
 
 dvilj_SOURCES = \
@@ -65,6 +67,12 @@ $(dvilj4l_OBJECTS): libdvilj.a
 
 LDADD = libdvilj.a $(KPATHSEA_LIBS)	
 
+dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\"
+
+dvilj6_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+
+dvilj6_LDADD =
+
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
 
@@ -80,14 +88,18 @@ man1_links = \
 include $(top_srcdir)/../am/man1_links.am
 
 install-exec-hook:
+if !WIN32
 	cd $(DESTDIR)$(bindir) && \
 	  rm -f dvilj6$(EXEEXT) && \
 	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
+endif !WIN32
 
 install-data-hook: install-man1-links
 
 uninstall-hook: uninstall-man1-links
+if !WIN32
 	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
+endif !WIN32
 
 VERSION = `grep 'define VERSION' $(srcdir)/dvi2xx.c | sed -e 's/^.*version //' -e 's/).*//'`
 if MAINTAINER_MODE
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index 82a3d80c15b..ca5075eadb9 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -37,7 +37,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = dvilj$(EXEEXT) dvilj2p$(EXEEXT) dvilj4$(EXEEXT) \
-	dvilj4l$(EXEEXT)
+	dvilj4l$(EXEEXT) $(am__EXEEXT_1)
+@WIN32_TRUE@am__append_1 = dvilj6
 DIST_COMMON = README $(am__configure_deps) \
 	$(am__dist_bin_SCRIPTS_DIST) $(dist_man1_MANS) \
 	$(srcdir)/../../build-aux/config.guess \
@@ -79,6 +80,7 @@ libdvilj_a_AR = $(AR) $(ARFLAGS)
 libdvilj_a_LIBADD =
 am_libdvilj_a_OBJECTS = tfm.$(OBJEXT)
 libdvilj_a_OBJECTS = $(am_libdvilj_a_OBJECTS)
+@WIN32_TRUE@am__EXEEXT_1 = dvilj6$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -99,6 +101,9 @@ am_dvilj4l_OBJECTS = dvilj4l-dvi2xx.$(OBJEXT)
 dvilj4l_OBJECTS = $(am_dvilj4l_OBJECTS)
 dvilj4l_LDADD = $(LDADD)
 dvilj4l_DEPENDENCIES = libdvilj.a $(am__DEPENDENCIES_1)
+am_dvilj6_OBJECTS = dvilj6-callexe.$(OBJEXT)
+dvilj6_OBJECTS = $(am_dvilj6_OBJECTS)
+dvilj6_DEPENDENCIES =
 am__dist_bin_SCRIPTS_DIST = dvihp
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -136,9 +141,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libdvilj_a_SOURCES) $(dvilj_SOURCES) $(dvilj2p_SOURCES) \
-	$(dvilj4_SOURCES) $(dvilj4l_SOURCES)
+	$(dvilj4_SOURCES) $(dvilj4l_SOURCES) $(dvilj6_SOURCES)
 DIST_SOURCES = $(libdvilj_a_SOURCES) $(dvilj_SOURCES) \
-	$(dvilj2p_SOURCES) $(dvilj4_SOURCES) $(dvilj4l_SOURCES)
+	$(dvilj2p_SOURCES) $(dvilj4_SOURCES) $(dvilj4l_SOURCES) \
+	$(dvilj6_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man1_MANS)
@@ -313,6 +319,9 @@ dvilj4l_SOURCES = \
 	dvi2xx.h
 
 LDADD = libdvilj.a $(KPATHSEA_LIBS)	
+dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\"
+dvilj6_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+dvilj6_LDADD = 
 dist_man1_MANS = dvihp.man dvilj.man
 
 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
@@ -442,6 +451,9 @@ dvilj4$(EXEEXT): $(dvilj4_OBJECTS) $(dvilj4_DEPENDENCIES)
 dvilj4l$(EXEEXT): $(dvilj4l_OBJECTS) $(dvilj4l_DEPENDENCIES) 
 	@rm -f dvilj4l$(EXEEXT)
 	$(LINK) $(dvilj4l_OBJECTS) $(dvilj4l_LDADD) $(LIBS)
+dvilj6$(EXEEXT): $(dvilj6_OBJECTS) $(dvilj6_DEPENDENCIES) 
+	@rm -f dvilj6$(EXEEXT)
+	$(LINK) $(dvilj6_OBJECTS) $(dvilj6_LDADD) $(LIBS)
 install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -487,6 +499,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj2p-dvi2xx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj4-dvi2xx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj4l-dvi2xx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvilj6-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfm.Po@am__quote@
 
 .c.o:
@@ -566,6 +579,20 @@ dvilj4l-dvi2xx.obj: dvi2xx.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj4l_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvilj4l-dvi2xx.obj `if test -f 'dvi2xx.c'; then $(CYGPATH_W) 'dvi2xx.c'; else $(CYGPATH_W) '$(srcdir)/dvi2xx.c'; fi`
 
+dvilj6-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvilj6-callexe.o -MD -MP -MF $(DEPDIR)/dvilj6-callexe.Tpo -c -o dvilj6-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvilj6-callexe.Tpo $(DEPDIR)/dvilj6-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvilj6-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvilj6-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+
+dvilj6-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvilj6-callexe.obj -MD -MP -MF $(DEPDIR)/dvilj6-callexe.Tpo -c -o dvilj6-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvilj6-callexe.Tpo $(DEPDIR)/dvilj6-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvilj6-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvilj6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvilj6-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -988,14 +1015,14 @@ uninstall-man1-links:
 	done
 
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && \
-	  rm -f dvilj6$(EXEEXT) && \
-	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
+@WIN32_FALSE@	cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  rm -f dvilj6$(EXEEXT) && \
+@WIN32_FALSE@	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
 
 install-data-hook: install-man1-links
 
 uninstall-hook: uninstall-man1-links
-	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
+@WIN32_FALSE@	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
 @MAINTAINER_MODE_TRUE@dvilj.man: dvilj.pod dvi2xx.c
 @MAINTAINER_MODE_TRUE@	pod2man --center="TeX-Live" --release="Version $(VERSION)" $< >$@
 dvilj.ps: dvilj.man
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL
index 60d6d776df4..bb2af248198 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/dvipdfmx/ChangeLog.TL
@@ -1,6 +1,11 @@
 ChangeLog.TL: TeX Live (TL) changes for dvipdfmx
 ================================================
 
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/Makefile.am [WIN32]: Add dvipdfmx.exe, ebb.exe, and
+	extractbb.exe wrappers for MinGW.
+
 2010-02-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* man: New directory with manual pages (from Master).
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am b/Build/source/texk/dvipdfmx/src/Makefile.am
index d4c5263edef..fd8fa5ee03d 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.am
+++ b/Build/source/texk/dvipdfmx/src/Makefile.am
@@ -1,14 +1,15 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipdfmx/src/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
-INCLUDES = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 bin_PROGRAMS = dvipdfmx
-if !WIN32
+if WIN32
+noinst_PROGRAMS = call_dvipdfmx
+else !WIN32
 dist_bin_SCRIPTS = dvipdft
 endif !WIN32
 
@@ -54,6 +55,12 @@ dvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND)
 
 LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
 
+call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\"
+
+call_dvipdfmx_SOURCES = $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+
+call_dvipdfmx_LDADD =
+
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
 ## Rebuild libpng
@@ -62,13 +69,19 @@ LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
 @ZLIB_RULE@
 
 install-exec-hook:
+if WIN32
+	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
+	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT)
+	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+else !WIN32
 	cd $(DESTDIR)$(bindir) && \
 	  rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \
+	  $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) && \
 	  $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT)
+	  $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT)
+endif !WIN32
 
 uninstall-hook:
+	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
-	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in
index 59e3fbc62a1..0c521774e79 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.in
+++ b/Build/source/texk/dvipdfmx/src/Makefile.in
@@ -36,6 +36,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = dvipdfmx$(EXEEXT)
+@WIN32_TRUE@noinst_PROGRAMS = call_dvipdfmx$(EXEEXT)
 subdir = src
 DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -60,7 +61,10 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am_call_dvipdfmx_OBJECTS = call_dvipdfmx-callexe.$(OBJEXT)
+call_dvipdfmx_OBJECTS = $(am_call_dvipdfmx_OBJECTS)
+call_dvipdfmx_DEPENDENCIES =
 am_dvipdfmx_OBJECTS = agl.$(OBJEXT) bmpimage.$(OBJEXT) cff.$(OBJEXT) \
 	cff_dict.$(OBJEXT) cid.$(OBJEXT) cidtype0.$(OBJEXT) \
 	cidtype2.$(OBJEXT) cmap.$(OBJEXT) cmap_read.$(OBJEXT) \
@@ -123,8 +127,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(dvipdfmx_SOURCES)
-DIST_SOURCES = $(dvipdfmx_SOURCES)
+SOURCES = $(call_dvipdfmx_SOURCES) $(dvipdfmx_SOURCES)
+DIST_SOURCES = $(call_dvipdfmx_SOURCES) $(dvipdfmx_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -254,8 +258,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
-AM_CPPFLAGS = 
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 @WIN32_FALSE@dist_bin_SCRIPTS = dvipdft
 dvipdfmx_SOURCES = \
@@ -298,6 +301,9 @@ dvipdfmx_SOURCES = \
 
 dvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND)
 LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
+call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\"
+call_dvipdfmx_SOURCES = $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+call_dvipdfmx_LDADD = 
 all: all-am
 
 .SUFFIXES:
@@ -375,6 +381,18 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+call_dvipdfmx$(EXEEXT): $(call_dvipdfmx_OBJECTS) $(call_dvipdfmx_DEPENDENCIES) 
+	@rm -f call_dvipdfmx$(EXEEXT)
+	$(LINK) $(call_dvipdfmx_OBJECTS) $(call_dvipdfmx_LDADD) $(LIBS)
 dvipdfmx$(EXEEXT): $(dvipdfmx_OBJECTS) $(dvipdfmx_DEPENDENCIES) 
 	@rm -f dvipdfmx$(EXEEXT)
 	$(LINK) $(dvipdfmx_OBJECTS) $(dvipdfmx_LDADD) $(LIBS)
@@ -421,6 +439,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/agl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bmpimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_dvipdfmx-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cff_dict.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cid.Po@am__quote@
@@ -510,6 +529,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+call_dvipdfmx-callexe.o: $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_dvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_dvipdfmx-callexe.o -MD -MP -MF $(DEPDIR)/call_dvipdfmx-callexe.Tpo -c -o call_dvipdfmx-callexe.o `test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(top_srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_dvipdfmx-callexe.Tpo $(DEPDIR)/call_dvipdfmx-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/../texlive/w32_wrapper/callexe.c' object='call_dvipdfmx-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_dvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_dvipdfmx-callexe.o `test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(top_srcdir)/../texlive/w32_wrapper/callexe.c
+
+call_dvipdfmx-callexe.obj: $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_dvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_dvipdfmx-callexe.obj -MD -MP -MF $(DEPDIR)/call_dvipdfmx-callexe.Tpo -c -o call_dvipdfmx-callexe.obj `if test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_dvipdfmx-callexe.Tpo $(DEPDIR)/call_dvipdfmx-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/../texlive/w32_wrapper/callexe.c' object='call_dvipdfmx-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_dvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_dvipdfmx-callexe.obj `if test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -632,7 +665,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -705,19 +739,20 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS
 .MAKE: install-am install-exec-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-dist_binSCRIPTS 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 \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-dist_binSCRIPTS uninstall-hook
+	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dist_binSCRIPTS \
+	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 maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_binSCRIPTS uninstall-hook
 
 
 @KPATHSEA_RULE@
@@ -725,16 +760,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS
 @ZLIB_RULE@
 
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && \
-	  rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+@WIN32_FALSE@	cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \
+@WIN32_FALSE@	  $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) && \
+@WIN32_FALSE@	  $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \
+@WIN32_FALSE@	  $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT)
 
 uninstall-hook:
+	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
-	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
 
 # 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.
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 48dd9d4b67e..b64f53a8206 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, configure.ac [WIN32]: Add dvigif.exe wrapper.
+
 2011-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* doc/Makefile.am: Use ../am/man1_links.am for manpage links.
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index bcddc3e197d..30e3a63e91d 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipng/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 #************************************************************************
@@ -27,9 +27,9 @@ EXTRA_DIST += $(DVIPNG_TREE)-PATCHES
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-INCLUDES = -I$(top_srcdir)/$(DVIPNG_TREE)
-INCLUDES += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES)
-INCLUDES +=  $(T1LIB_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE)
+AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES)
+AM_CPPFLAGS +=  $(T1LIB_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 DVIPS = dvips -Ppdf
@@ -90,6 +90,12 @@ DISTCLEANFILES = config.force
 LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS)
 LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
 
+dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\"
+
+dvigif_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+
+dvigif_LDADD =
+
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
 ## Rebuild libfreetype
@@ -104,12 +110,16 @@ LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
 @ZLIB_RULE@
 
 if have_gif
+if WIN32
+bin_PROGRAMS += dvigif
+else !WIN32
 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && \
 	  rm -f dvigif$(EXEEXT) && \
 	  $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT)
 uninstall-hook:
 	rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT)
+endif !WIN32
 endif have_gif
 
 TESTS = dvipng.test
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index e1053a24715..31bc72e0d94 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = dvipng$(EXEEXT)
+bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1)
 @have_t1_TRUE@am__append_1 = \
 @have_t1_TRUE@	$(DVIPNG_TREE)/t1.c
 
@@ -47,6 +47,7 @@ bin_PROGRAMS = dvipng$(EXEEXT)
 @have_ft2_or_t1_TRUE@	$(DVIPNG_TREE)/fontmap.c \
 @have_ft2_or_t1_TRUE@	$(DVIPNG_TREE)/tfm.c
 
+@WIN32_TRUE@@have_gif_TRUE@am__append_4 = dvigif
 subdir = .
 DIST_COMMON = $(am__configure_deps) \
 	$(srcdir)/../../build-aux/config.guess \
@@ -71,6 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -86,8 +88,12 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@WIN32_TRUE@@have_gif_TRUE@am__EXEEXT_1 = dvigif$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
+am_dvigif_OBJECTS = dvigif-callexe.$(OBJEXT)
+dvigif_OBJECTS = $(am_dvigif_OBJECTS)
+dvigif_DEPENDENCIES =
 @have_t1_TRUE@am__objects_1 = t1.$(OBJEXT)
 @have_ft2_TRUE@am__objects_2 = ft.$(OBJEXT) sfd.$(OBJEXT)
 @have_ft2_or_t1_TRUE@am__objects_3 = enc.$(OBJEXT) fontmap.$(OBJEXT) \
@@ -116,8 +122,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(nodist_dvipng_SOURCES)
-DIST_SOURCES =
+SOURCES = $(dvigif_SOURCES) $(nodist_dvipng_SOURCES)
+DIST_SOURCES = $(dvigif_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -323,7 +329,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4 -I m4
 EXTRA_DIST = $(DVIPNG_TREE) $(DVIPNG_TREE)-PATCHES dvipng.test \
 	dvipng-test.dvi
-INCLUDES = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \
+AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \
 	$(FREETYPE2_INCLUDES) $(GD_INCLUDES) $(T1LIB_INCLUDES) \
 	$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
@@ -347,6 +353,9 @@ dvipng_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) \
 DISTCLEANFILES = config.force
 LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \
 	$(LIBPNG_LIBS) $(ZLIB_LIBS)
+dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\"
+dvigif_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+dvigif_LDADD = 
 TESTS = dvipng.test
 CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png
 all: config.h
@@ -448,6 +457,9 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+dvigif$(EXEEXT): $(dvigif_OBJECTS) $(dvigif_DEPENDENCIES) 
+	@rm -f dvigif$(EXEEXT)
+	$(LINK) $(dvigif_OBJECTS) $(dvigif_LDADD) $(LIBS)
 dvipng$(EXEEXT): $(dvipng_OBJECTS) $(dvipng_DEPENDENCIES) 
 	@rm -f dvipng$(EXEEXT)
 	$(LINK) $(dvipng_OBJECTS) $(dvipng_LDADD) $(LIBS)
@@ -461,6 +473,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvigif-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvipng.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Po@am__quote@
@@ -498,6 +511,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+dvigif-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvigif-callexe.o -MD -MP -MF $(DEPDIR)/dvigif-callexe.Tpo -c -o dvigif-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvigif-callexe.Tpo $(DEPDIR)/dvigif-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvigif-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvigif-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+
+dvigif-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvigif-callexe.obj -MD -MP -MF $(DEPDIR)/dvigif-callexe.Tpo -c -o dvigif-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvigif-callexe.Tpo $(DEPDIR)/dvigif-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvigif-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvigif-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+
 color.o: $(DVIPNG_TREE)/color.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT color.o -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.o `test -f '$(DVIPNG_TREE)/color.c' || echo '$(srcdir)/'`$(DVIPNG_TREE)/color.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po
@@ -1200,7 +1227,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."
+@WIN32_TRUE@install-exec-hook:
 @have_gif_FALSE@install-exec-hook:
+@WIN32_TRUE@uninstall-hook:
 @have_gif_FALSE@uninstall-hook:
 clean: clean-recursive
 
@@ -1318,13 +1347,12 @@ config.force: $(dvipng_dependencies)
 @T1LIB_RULE@
 @LIBPNG_RULE@
 @ZLIB_RULE@
-
-@have_gif_TRUE@install-exec-hook:
-@have_gif_TRUE@	cd $(DESTDIR)$(bindir) && \
-@have_gif_TRUE@	  rm -f dvigif$(EXEEXT) && \
-@have_gif_TRUE@	  $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT)
-@have_gif_TRUE@uninstall-hook:
-@have_gif_TRUE@	rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT)
+@WIN32_FALSE@@have_gif_TRUE@install-exec-hook:
+@WIN32_FALSE@@have_gif_TRUE@	cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@@have_gif_TRUE@	  rm -f dvigif$(EXEEXT) && \
+@WIN32_FALSE@@have_gif_TRUE@	  $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT)
+@WIN32_FALSE@@have_gif_TRUE@uninstall-hook:
+@WIN32_FALSE@@have_gif_TRUE@	rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT)
 
 # 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.
diff --git a/Build/source/texk/dvipng/aclocal.m4 b/Build/source/texk/dvipng/aclocal.m4
index 1e4dcc17fc8..75b85225d42 100644
--- a/Build/source/texk/dvipng/aclocal.m4
+++ b/Build/source/texk/dvipng/aclocal.m4
@@ -998,6 +998,7 @@ m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/kpse-libpng-flags.m4])
 m4_include([../../m4/kpse-t1lib-flags.m4])
 m4_include([../../m4/kpse-warnings.m4])
+m4_include([../../m4/kpse-win32.m4])
 m4_include([../../m4/kpse-zlib-flags.m4])
 m4_include([../../m4/libtool.m4])
 m4_include([../../m4/ltoptions.m4])
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 4f2357350f4..805d2afea93 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -616,6 +616,8 @@ ac_header_list=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+WIN32_FALSE
+WIN32_TRUE
 DVIPNG_TREE
 have_gif_FALSE
 have_gif_TRUE
@@ -16474,6 +16476,61 @@ ac_config_headers="$ac_config_headers config.h"
 DVIPNG_TREE=dvipng-1.14
 
 
+{ $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
+
+
 ac_config_files="$ac_config_files Makefile help/Makefile doc/Makefile"
 
 
@@ -16626,6 +16683,10 @@ if test -z "${have_gif_TRUE}" && test -z "${have_gif_FALSE}"; then
   as_fn_error $? "conditional \"have_gif\" 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
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 4ae238768d1..163997abb24 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009 - 2011 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,
@@ -194,6 +194,9 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_SUBST([DVIPNG_TREE], [dvipng-]dvipng_version)
 
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+
 AC_CONFIG_FILES([Makefile help/Makefile doc/Makefile])
 
 AC_OUTPUT
diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in
index 459616fcdab..67e1de7332d 100644
--- a/Build/source/texk/dvipng/doc/Makefile.in
+++ b/Build/source/texk/dvipng/doc/Makefile.in
@@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
diff --git a/Build/source/texk/dvipng/help/Makefile.in b/Build/source/texk/dvipng/help/Makefile.in
index 33aec474c67..c6d9c86008a 100644
--- a/Build/source/texk/dvipng/help/Makefile.in
+++ b/Build/source/texk/dvipng/help/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
diff --git a/Build/source/texk/texlive/w32_wrapper/callexe.c b/Build/source/texk/texlive/w32_wrapper/callexe.c
new file mode 100644
index 00000000000..1d4dac4a80e
--- /dev/null
+++ b/Build/source/texk/texlive/w32_wrapper/callexe.c
@@ -0,0 +1,43 @@
+/* Public domain.
+ * Originally written by Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+ *
+ * WIN32 wrapper program replacing Unix symlinks such as,
+ * e.g., ofm2opl -> omfonts.
+ *
+ * EXEPROG must be defined in the Makefile as,
+ * e.g., -DEXEPROG=\"omfonts.exe\".
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <process.h>
+#include <string.h>
+#include <malloc.h>
+
+static int is_include_space(char *s)
+{
+  char *p;
+  p = strchr(s, ' ');
+  if(p) return 1;
+  p = strchr(s, '\t');
+  if(p) return 1;
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+  int i;
+  char *p;
+
+  for(i = 0; i < argc; i++) {
+    if(is_include_space(argv[i])) {
+      p = (char *)malloc(strlen(argv[i])+3);
+      strcpy(p, "\"");
+      strcat(p, argv[i]);
+      strcat(p, "\"");
+      free(argv[i]);
+      argv[i] = p;
+    }
+  }
+  argv[argc] = NULL;
+  return spawnvp(_P_WAIT, EXEPROG, (const char * const *)argv);
+}
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 90d29f22b3e..1c4b7962247 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (install_exe_links, uninstall_exe_links): Hooks to
+	install and uninstall MinGW wrappers.
+
 2011-02-14  Karl Berry  <karl@tug.org>
 
 	* texmfmp-help.h: propagate -output-dir wording change to other msgs. 
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 50ef355c43d..17d212caf5f 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -34,6 +34,8 @@ CLEANFILES =
 TRIPTRAP_CLEAN =
 TRIPTRAP =
 bin_links =
+install_exe_links =
+uninstall_exe_links =
 
 # in case of an SVN repository
 dist-hook:
@@ -204,7 +206,7 @@ include $(srcdir)/synctexdir/am/synctex.am
 include $(srcdir)/libmd5/am/md5.am
 
 # Symlinks within $(bindir): FILE:LINK indicates LINK$(EXEEXT)->FILE$(EXEEXT)
-install-exec-hook:
+install-exec-hook: $(install_exe_links)
 	@test -z "$(bin_links)" || { \
 	  cd $(DESTDIR)$(bindir) && \
 	  for s in $(bin_links); do \
@@ -214,7 +216,7 @@ install-exec-hook:
 	    echo "creating link '$$link' -> '$$file'"; \
 	    $(LN_S) $$file $$link || exit 1; \
 	  done; }
-uninstall-hook:
+uninstall-hook: $(uninstall_exe_links)
 	@test -z "$(bin_links)" || \
 	for s in $(bin_links); do \
 	  link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index de436bebc3e..304ab85b43f 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -45,17 +45,18 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \
 	$(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
 	$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
 	$(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
-	$(am__EXEEXT_20) synctex$(EXEEXT)
-noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT)
-check_PROGRAMS = $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \
-	$(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
-	$(am__EXEEXT_27) md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_30) ctiedir/ctie.test \
+	$(am__EXEEXT_20) $(am__EXEEXT_21) synctex$(EXEEXT)
+noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
+	$(am__EXEEXT_29)
+check_PROGRAMS = $(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \
+	$(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27) \
+	$(am__EXEEXT_28) md5main$(EXEEXT)
+TESTS = tangle.test $(am__EXEEXT_32) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_4) \
-	$(am__append_10) $(am__append_16) $(am__append_21) \
-	$(am__append_27) $(am__append_32) $(am__append_37) \
-	$(am__append_41) $(am__append_55) $(am__append_58) \
-	$(am__append_59) libmd5/md5.test
+	$(am__append_10) $(am__append_17) $(am__append_22) \
+	$(am__append_28) $(am__append_33) $(am__append_38) \
+	$(am__append_45) $(am__append_59) $(am__append_62) \
+	$(am__append_63) libmd5/md5.test
 DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
@@ -104,53 +105,57 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @MF_TRUE@am__append_12 = mftrap.diffs
 @MF_TRUE@am__append_13 = trap-clean
 @MP_TRUE@am__append_14 = mpost
-@MP_TRUE@am__append_15 = mpost:dvitomp
-@MP_TRUE@am__append_16 = $(mp_tests)
-@MP_TRUE@am__append_17 = pltotf tftopl
-@MP_TRUE@am__append_18 = mptrap.diffs
-@MP_TRUE@am__append_19 = mptrap-clean
-@ETEX_TRUE@am__append_20 = etex
-@ETEX_TRUE@am__append_21 = $(etex_tests)
-@ETEX_TRUE@am__append_22 = dvitype pltotf tftopl
-@ETEX_TRUE@am__append_23 = etrip.diffs
-@ETEX_TRUE@am__append_24 = etrip-clean
-@PTEX_TRUE@am__append_25 = ptex
-@PTEX_TRUE@@WEB_TRUE@am__append_26 = $(pweb_programs)
-@PTEX_TRUE@am__append_27 = $(ptex_tests)
-@PTEX_TRUE@am__append_28 = dvitype pltotf tftopl
-@PTEX_TRUE@am__append_29 = ptrip.diffs
-@PTEX_TRUE@am__append_30 = ptrip-clean
-@EPTEX_TRUE@am__append_31 = eptex
-@EPTEX_TRUE@am__append_32 = $(eptex_tests)
-@EPTEX_TRUE@am__append_33 = dvitype pltotf tftopl
-@EPTEX_TRUE@am__append_34 = eptrip.diffs
-@EPTEX_TRUE@am__append_35 = eptrip-clean
-@PDFTEX_TRUE@am__append_36 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_37 = $(pdftex_tests)
-@MINGW32_TRUE@am__append_38 = \
+@MP_TRUE@@WIN32_TRUE@am__append_15 = dvitomp
+@MP_TRUE@@WIN32_FALSE@am__append_16 = mpost:dvitomp
+@MP_TRUE@am__append_17 = $(mp_tests)
+@MP_TRUE@am__append_18 = pltotf tftopl
+@MP_TRUE@am__append_19 = mptrap.diffs
+@MP_TRUE@am__append_20 = mptrap-clean
+@ETEX_TRUE@am__append_21 = etex
+@ETEX_TRUE@am__append_22 = $(etex_tests)
+@ETEX_TRUE@am__append_23 = dvitype pltotf tftopl
+@ETEX_TRUE@am__append_24 = etrip.diffs
+@ETEX_TRUE@am__append_25 = etrip-clean
+@PTEX_TRUE@am__append_26 = ptex
+@PTEX_TRUE@@WEB_TRUE@am__append_27 = $(pweb_programs)
+@PTEX_TRUE@am__append_28 = $(ptex_tests)
+@PTEX_TRUE@am__append_29 = dvitype pltotf tftopl
+@PTEX_TRUE@am__append_30 = ptrip.diffs
+@PTEX_TRUE@am__append_31 = ptrip-clean
+@EPTEX_TRUE@am__append_32 = eptex
+@EPTEX_TRUE@am__append_33 = $(eptex_tests)
+@EPTEX_TRUE@am__append_34 = dvitype pltotf tftopl
+@EPTEX_TRUE@am__append_35 = eptrip.diffs
+@EPTEX_TRUE@am__append_36 = eptrip-clean
+@PDFTEX_TRUE@am__append_37 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_38 = $(pdftex_tests)
+@MINGW32_TRUE@am__append_39 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
-@LUATEX_TRUE@am__append_39 = luatex
-@LUATEX_TRUE@am__append_40 = luatex:texlua luatex:texluac
-@LUATEX_TRUE@am__append_41 = $(luatex_tests)
-@MINGW32_FALSE@am__append_42 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_43 = xetex
-@XETEX_MACOSX_TRUE@am__append_44 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_45 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_46 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@LUATEX_TRUE@am__append_40 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_41 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_42 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_43 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_44 = luatex:texlua luatex:texluac
+@LUATEX_TRUE@am__append_45 = $(luatex_tests)
+@MINGW32_FALSE@am__append_46 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_47 = xetex
+@XETEX_MACOSX_TRUE@am__append_48 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_49 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_50 = -DXETEX_OTHER $(XPDF_INCLUDES) \
 @XETEX_MACOSX_FALSE@	$(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_47 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_48 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_49 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_50 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_51 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_52 = \
+@XETEX_MACOSX_FALSE@am__append_51 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_52 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_53 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_54 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_55 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_56 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
-@XETEX_MACOSX_FALSE@am__append_53 = \
+@XETEX_MACOSX_FALSE@am__append_57 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeX_pic.c \
@@ -167,59 +172,59 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @XETEX_MACOSX_FALSE@	xetexdir/pngimage.c \
 @XETEX_MACOSX_FALSE@	xetexdir/pngimage.h
 
-@XETEX_GRAPHITE_TRUE@am__append_54 = \
+@XETEX_GRAPHITE_TRUE@am__append_58 = \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.cpp \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.h
 
-@XETEX_TRUE@am__append_55 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_56 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_57 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_58 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_59 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_60 = pltotf tftopl
-@ALEPH_TRUE@am__append_61 = aleph
-@TEX_SYNCTEX_TRUE@am__append_62 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_59 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_60 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_61 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_62 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_63 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_64 = pltotf tftopl
+@ALEPH_TRUE@am__append_65 = aleph
+@TEX_SYNCTEX_TRUE@am__append_66 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__
-@TEX_SYNCTEX_TRUE@am__append_63 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_64 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_65 = \
+@TEX_SYNCTEX_TRUE@am__append_67 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_68 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_69 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@TEX_SYNCTEX_TRUE@am__append_66 = \
+@TEX_SYNCTEX_TRUE@am__append_70 = \
 @TEX_SYNCTEX_TRUE@	synctex.c
 
-@ETEX_SYNCTEX_TRUE@am__append_67 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_71 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__
-@ETEX_SYNCTEX_TRUE@am__append_68 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_69 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_70 = \
+@ETEX_SYNCTEX_TRUE@am__append_72 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_73 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_74 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_71 = \
+@ETEX_SYNCTEX_TRUE@am__append_75 = \
 @ETEX_SYNCTEX_TRUE@	synctex-e.c
 
-@PDFTEX_SYNCTEX_TRUE@am__append_72 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_76 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__
-@PDFTEX_SYNCTEX_TRUE@am__append_73 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_77 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_74 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_78 = \
 @PDFTEX_SYNCTEX_TRUE@	synctex-pdf.c
 
-@XETEX_SYNCTEX_TRUE@am__append_75 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_79 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__
-@XETEX_SYNCTEX_TRUE@am__append_76 = \
+@XETEX_SYNCTEX_TRUE@am__append_80 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_77 = \
+@XETEX_SYNCTEX_TRUE@am__append_81 = \
 @XETEX_SYNCTEX_TRUE@	synctex-xe.c
 
 subdir = .
@@ -538,30 +543,32 @@ am__EXEEXT_5 = $(am__EXEEXT_3) $(am__EXEEXT_4)
 @MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
 @MFN_TRUE@@MF_TRUE@am__EXEEXT_9 = mf-nowin$(EXEEXT)
 @MP_TRUE@am__EXEEXT_10 = mpost$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_11 = etex$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_12 = ptex$(EXEEXT)
-@PTEX_TRUE@@WEB_TRUE@am__EXEEXT_13 = $(am__EXEEXT_2)
-@EPTEX_TRUE@am__EXEEXT_14 = eptex$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_15 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_11 = dvitomp$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_12 = etex$(EXEEXT)
+@PTEX_TRUE@am__EXEEXT_13 = ptex$(EXEEXT)
+@PTEX_TRUE@@WEB_TRUE@am__EXEEXT_14 = $(am__EXEEXT_2)
+@EPTEX_TRUE@am__EXEEXT_15 = eptex$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_16 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
 @PDFTEX_TRUE@	pdftosrc$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_16 = luatex$(EXEEXT)
-@XETEX_TRUE@am__EXEEXT_17 = xetex$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_18 = $(am__EXEEXT_3)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_19 = $(am__EXEEXT_4)
-@ALEPH_TRUE@am__EXEEXT_20 = aleph$(EXEEXT)
+@LUATEX_TRUE@am__EXEEXT_17 = luatex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_18 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_19 = $(am__EXEEXT_3)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_20 = $(am__EXEEXT_4)
+@ALEPH_TRUE@am__EXEEXT_21 = aleph$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man5dir)"
-@TEX_TRUE@am__EXEEXT_21 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@TEX_TRUE@am__EXEEXT_22 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @TEX_TRUE@	tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_22 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_23 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_24 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@MF_TRUE@am__EXEEXT_23 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@am__EXEEXT_24 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_25 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @ETEX_TRUE@	tftopl$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_25 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@PTEX_TRUE@am__EXEEXT_26 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @PTEX_TRUE@	tftopl$(EXEEXT)
-@EPTEX_TRUE@am__EXEEXT_26 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EPTEX_TRUE@am__EXEEXT_27 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @EPTEX_TRUE@	tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_27 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_28 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_29 = call_luatex$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \
 	aleph-alephextra.$(OBJEXT)
@@ -578,6 +585,9 @@ nodist_bibtex_OBJECTS = bibtex.$(OBJEXT)
 bibtex_OBJECTS = $(nodist_bibtex_OBJECTS)
 bibtex_LDADD = $(LDADD)
 bibtex_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am_call_luatex_OBJECTS = call_luatex-callexe.$(OBJEXT)
+call_luatex_OBJECTS = $(am_call_luatex_OBJECTS)
+call_luatex_DEPENDENCIES =
 nodist_ctangle_OBJECTS = ctangle-ctangle.$(OBJEXT) \
 	ctangle-cweb.$(OBJEXT)
 ctangle_OBJECTS = $(nodist_ctangle_OBJECTS)
@@ -607,6 +617,9 @@ nodist_dvicopy_OBJECTS = dvicopy.$(OBJEXT)
 dvicopy_OBJECTS = $(nodist_dvicopy_OBJECTS)
 dvicopy_LDADD = $(LDADD)
 dvicopy_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am_dvitomp_OBJECTS = dvitomp-callexe.$(OBJEXT)
+dvitomp_OBJECTS = $(am_dvitomp_OBJECTS)
+dvitomp_DEPENDENCIES =
 nodist_dvitype_OBJECTS = dvitype.$(OBJEXT)
 dvitype_OBJECTS = $(nodist_dvitype_OBJECTS)
 dvitype_LDADD = $(LDADD)
@@ -895,9 +908,10 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(libpdftex_a_SOURCES) $(EXTRA_libpdftex_a_SOURCES) \
 	$(libxetex_a_SOURCES) $(libxetexmm_a_SOURCES) \
 	$(dist_aleph_SOURCES) $(nodist_aleph_SOURCES) \
-	$(nodist_bibtex_SOURCES) $(nodist_ctangle_SOURCES) \
-	$(nodist_ctangleboot_SOURCES) $(nodist_ctie_SOURCES) \
-	$(nodist_cweave_SOURCES) $(nodist_dvicopy_SOURCES) \
+	$(nodist_bibtex_SOURCES) $(call_luatex_SOURCES) \
+	$(nodist_ctangle_SOURCES) $(nodist_ctangleboot_SOURCES) \
+	$(nodist_ctie_SOURCES) $(nodist_cweave_SOURCES) \
+	$(nodist_dvicopy_SOURCES) $(dvitomp_SOURCES) \
 	$(nodist_dvitype_SOURCES) $(dist_eptex_SOURCES) \
 	$(nodist_eptex_SOURCES) $(dist_etex_SOURCES) \
 	$(nodist_etex_SOURCES) $(gftodvi_SOURCES) \
@@ -934,6 +948,7 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(libmplib_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \
 	$(EXTRA_libpdftex_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
 	$(libxetexmm_a_SOURCES) $(dist_aleph_SOURCES) \
+	$(call_luatex_SOURCES) $(dvitomp_SOURCES) \
 	$(dist_eptex_SOURCES) $(am__dist_etex_SOURCES_DIST) \
 	$(gftodvi_SOURCES) $(luatex_SOURCES) $(md5main_SOURCES) \
 	$(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) $(pbibtex_SOURCES) \
@@ -983,13 +998,13 @@ ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
-am__EXEEXT_28 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_30 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
 	gftopk.test gftype.test mft.test patgen.test pktogf.test \
 	pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
 	vptovf.test weave.test
-am__EXEEXT_29 = $(am__EXEEXT_28) tests/bibtex-openout-test.pl \
+am__EXEEXT_31 = $(am__EXEEXT_30) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_30 = $(am__EXEEXT_29)
+@WEB_TRUE@am__EXEEXT_32 = $(am__EXEEXT_31)
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -1494,11 +1509,13 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \
 	aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = 
-TRIPTRAP_CLEAN = $(am__append_7) $(am__append_13) $(am__append_19) \
+TRIPTRAP_CLEAN = $(am__append_7) $(am__append_13) $(am__append_20) \
+	$(am__append_25) $(am__append_31) $(am__append_36)
+TRIPTRAP = $(am__append_6) $(am__append_12) $(am__append_19) \
 	$(am__append_24) $(am__append_30) $(am__append_35)
-TRIPTRAP = $(am__append_6) $(am__append_12) $(am__append_18) \
-	$(am__append_23) $(am__append_29) $(am__append_34)
-bin_links = $(am__append_15) $(am__append_40)
+bin_links = $(am__append_16) $(am__append_44)
+install_exe_links = $(am__append_42)
+uninstall_exe_links = $(am__append_43)
 web2c = $(SHELL) ./web2c-sh $@
 makecpool = web2c/makecpool
 
@@ -1583,19 +1600,19 @@ cweave_CFLAGS = $(WARNING_CFLAGS)
 nodist_tie_SOURCES = tie.c
 tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 tie_CFLAGS = $(WARNING_CFLAGS)
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_62)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_66)
 tex_CFLAGS = $(WARNING_CFLAGS)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_63)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_67)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c $(am__append_66)
-dist_tex_SOURCES = texextra.c $(am__append_65)
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c $(am__append_70)
+dist_tex_SOURCES = texextra.c $(am__append_69)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_64)
+tex_prereq = texd.h $(am__append_68)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -1643,6 +1660,9 @@ mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 mpost_CFLAGS = $(WARNING_CFLAGS)
 mpost_DEPENDENCIES = libmplib.a
 mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
+dvitomp_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+dvitomp_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+dvitomp_LDADD = 
 
 # Creating one file: just one rule
 mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
@@ -1663,21 +1683,21 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
 tfmin_c_h = mptfmin.h tfmin.c
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/memio.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_67)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_71)
 etex_CFLAGS = $(WARNING_CFLAGS)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_68)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_72)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h \
-	$(am__append_71)
+	$(am__append_75)
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	$(am__append_70)
+	$(am__append_74)
 
 # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_69)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_73)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -1795,7 +1815,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_72)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_76)
 pdftex_CFLAGS = $(WARNING_CFLAGS)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
@@ -1808,9 +1828,9 @@ pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
 pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
 	pdftexdir/etex_version.h pdftexdir/pdftex_version.h \
-	$(am__append_74)
+	$(am__append_78)
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
-	$(am__append_73)
+	$(am__append_77)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -1837,7 +1857,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writejbig2.c pdftexdir/writejbig2.h \
 	pdftexdir/writejpg.c pdftexdir/writepng.c pdftexdir/writet1.c \
 	pdftexdir/writet3.c pdftexdir/writettf.c pdftexdir/writettf.h \
-	pdftexdir/writezip.c $(am__append_38)
+	pdftexdir/writezip.c $(am__append_39)
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
 	pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
@@ -1872,11 +1892,14 @@ luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \
 	$(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) \
 	$(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a
 luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h
+call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+call_luatex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+call_luatex_LDADD = 
 
 # luaTeX Tests
 #
 luatex_tests = luatexdir/luatex.test
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_42)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_46)
 liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
 liblua51_a_SOURCES = \
 	luatexdir/lua51/lapi.c \
@@ -2307,17 +2330,17 @@ libluatex_a_SOURCES = \
 
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_45)
+libxetex = libxetex.a $(am__append_49)
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
-	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_44) \
-	$(am__append_46) $(am__append_49) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_47) \
-	$(am__append_50) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_48) \
+	$(am__append_50) $(am__append_53) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_51) \
+	$(am__append_54) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
-	$(TECKIT_DEPEND) $(am__append_48) $(am__append_51) \
+	$(TECKIT_DEPEND) $(am__append_52) $(am__append_55) \
 	$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_75)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_79)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -2327,9 +2350,9 @@ xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
 xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
 nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_77)
+	$(am__append_81)
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
-	$(am__append_76)
+	$(am__append_80)
 xetex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2360,7 +2383,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
 	xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
 	xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
 	xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
-	$(am__append_52) $(am__append_53) $(am__append_54)
+	$(am__append_56) $(am__append_57) $(am__append_58)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -2703,6 +2726,9 @@ aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES)
 bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) 
 	@rm -f bibtex$(EXEEXT)
 	$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
+call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) 
+	@rm -f call_luatex$(EXEEXT)
+	$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
 ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) 
 	@rm -f ctangle$(EXEEXT)
 	$(ctangle_LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
@@ -2718,6 +2744,9 @@ cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES)
 dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) 
 	@rm -f dvicopy$(EXEEXT)
 	$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
+dvitomp$(EXEEXT): $(dvitomp_OBJECTS) $(dvitomp_DEPENDENCIES) 
+	@rm -f dvitomp$(EXEEXT)
+	$(LINK) $(dvitomp_OBJECTS) $(dvitomp_LDADD) $(LIBS)
 dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) 
 	@rm -f dvitype$(EXEEXT)
 	$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
@@ -2858,6 +2887,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aleph-alephextra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aleph-alephini.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibtex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_luatex-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangle-ctangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangle-cweb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangleboot.Po@am__quote@
@@ -2866,6 +2896,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cweave-cweb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwebboot.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvicopy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvitomp-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvitype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex-pool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex0.Po@am__quote@
@@ -7126,6 +7157,20 @@ aleph-aleph-pool.obj: aleph-pool.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -c -o aleph-aleph-pool.obj `if test -f 'aleph-pool.c'; then $(CYGPATH_W) 'aleph-pool.c'; else $(CYGPATH_W) '$(srcdir)/aleph-pool.c'; fi`
 
+call_luatex-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_luatex-callexe.o -MD -MP -MF $(DEPDIR)/call_luatex-callexe.Tpo -c -o call_luatex-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_luatex-callexe.Tpo $(DEPDIR)/call_luatex-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='call_luatex-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_luatex-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+
+call_luatex-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_luatex-callexe.obj -MD -MP -MF $(DEPDIR)/call_luatex-callexe.Tpo -c -o call_luatex-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_luatex-callexe.Tpo $(DEPDIR)/call_luatex-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='call_luatex-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_luatex-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+
 ctangle-ctangle.o: ctangle.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ctangle_CFLAGS) $(CFLAGS) -MT ctangle-ctangle.o -MD -MP -MF $(DEPDIR)/ctangle-ctangle.Tpo -c -o ctangle-ctangle.o `test -f 'ctangle.c' || echo '$(srcdir)/'`ctangle.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ctangle-ctangle.Tpo $(DEPDIR)/ctangle-ctangle.Po
@@ -7196,6 +7241,20 @@ cweave-cweb.obj: cweb.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cweave_CFLAGS) $(CFLAGS) -c -o cweave-cweb.obj `if test -f 'cweb.c'; then $(CYGPATH_W) 'cweb.c'; else $(CYGPATH_W) '$(srcdir)/cweb.c'; fi`
 
+dvitomp-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvitomp-callexe.o -MD -MP -MF $(DEPDIR)/dvitomp-callexe.Tpo -c -o dvitomp-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvitomp-callexe.Tpo $(DEPDIR)/dvitomp-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvitomp-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvitomp-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+
+dvitomp-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvitomp-callexe.obj -MD -MP -MF $(DEPDIR)/dvitomp-callexe.Tpo -c -o dvitomp-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvitomp-callexe.Tpo $(DEPDIR)/dvitomp-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvitomp-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvitomp-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+
 eptex-eptexextra.o: eptexdir/eptexextra.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(eptex_CFLAGS) $(CFLAGS) -MT eptex-eptexextra.o -MD -MP -MF $(DEPDIR)/eptex-eptexextra.Tpo -c -o eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eptex-eptexextra.Tpo $(DEPDIR)/eptex-eptexextra.Po
@@ -9323,6 +9382,14 @@ $(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT
 
 $(luatex_OBJECTS): libluatex.a
 
+.PHONY: install-luatex-links uninstall-luatex-links
+@WIN32_TRUE@install-luatex-links: call_luatex$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+@WIN32_TRUE@uninstall-luatex-links:
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+
 $(libluasocket_a_OBJECTS): liblua51.a
 
 $(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES)
@@ -9696,7 +9763,7 @@ synctex-xe.c: xetexd.h synctexdir/synctex.c $(dist_xetex_SOURCES)
 	sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/synctexdir/synctex.c >$@
 
 # Symlinks within $(bindir): FILE:LINK indicates LINK$(EXEEXT)->FILE$(EXEEXT)
-install-exec-hook:
+install-exec-hook: $(install_exe_links)
 	@test -z "$(bin_links)" || { \
 	  cd $(DESTDIR)$(bindir) && \
 	  for s in $(bin_links); do \
@@ -9706,7 +9773,7 @@ install-exec-hook:
 	    echo "creating link '$$link' -> '$$file'"; \
 	    $(LN_S) $$file $$link || exit 1; \
 	  done; }
-uninstall-hook:
+uninstall-hook: $(uninstall_exe_links)
 	@test -z "$(bin_links)" || \
 	for s in $(bin_links); do \
 	  link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index e3d612d2b40..596f0b9008b 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/luatex.am [WIN32]: Add texlua.exe and texluac.exe wrappers
+	for MinGW.
+
 2010-12-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/luatex.am: install-exec-hook and uninstall-hook rules now
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 91fd0da9b0c..51f4c58ddef 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -7,7 +7,13 @@
 ##
 if LUATEX
 bin_PROGRAMS += luatex
+if WIN32
+noinst_PROGRAMS += call_luatex
+install_exe_links += install-luatex-links
+uninstall_exe_links += uninstall-luatex-links
+else !WIN32
 bin_links += luatex:texlua luatex:texluac
+endif !WIN32
 endif LUATEX
 EXTRA_PROGRAMS += luatex
 
@@ -41,6 +47,22 @@ EXTRA_DIST += luatexdir/ptexlib.h
 
 EXTRA_DIST += luatexdir/getluatexsvnversion.sh
 
+call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
+
+call_luatex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+
+call_luatex_LDADD =
+
+.PHONY: install-luatex-links uninstall-luatex-links
+if WIN32
+install-luatex-links: call_luatex$(EXEEXT)
+	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+	$(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+uninstall-luatex-links:
+	rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
+endif WIN32
+
 # luaTeX Tests
 #
 luatex_tests = luatexdir/luatex.test
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 97972dfbf94..26e8afaf8a1 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/mplib.am [WIN32]: Add dvitomp.exe wrapper for MinGW.
+
 2011-01-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/mplib.am (mptrap.diffs): Use $(triptrap_diffs).
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index b7067f9376a..5693884d8fa 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -7,7 +7,11 @@
 ##
 if MP
 bin_PROGRAMS += mpost
+if WIN32
+bin_PROGRAMS += dvitomp
+else !WIN32
 bin_links += mpost:dvitomp
+endif !WIN32
 endif MP
 EXTRA_PROGRAMS += mpost
 
@@ -16,6 +20,10 @@ mpost_CFLAGS = $(WARNING_CFLAGS)
 mpost_DEPENDENCIES = libmplib.a
 mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
 
+dvitomp_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+dvitomp_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+dvitomp_LDADD =
+
 # Creating one file: just one rule
 mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
 # Creating several files: need stamp file and two identical rules
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 76c6321ffb4..dd3d4dbabcf 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am [WIN32]: Add o??2o??.exe wrappers.
+
 2010-12-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* omfonts.c: Check for argv[0] with .exe via strcasecmp().
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am
index 265d54c8216..fb55ec6d3f7 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.am
+++ b/Build/source/texk/web2c/omegafonts/Makefile.am
@@ -1,9 +1,9 @@
 ## Makefile.am for the TeX Live subdirectory texk/web2c/omegafonts/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
-INCLUDES =  -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C
+AM_CPPFLAGS =  -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C
 AM_CFLAGS = $(WARNING_CFLAGS)
 AM_YFLAGS = -d -v
 
@@ -20,6 +20,9 @@ bin_PROGRAMS =
 if OTANGLE
 if OMFONTS
 bin_PROGRAMS += omfonts
+if WIN32
+noinst_PROGRAMS = call_omfonts
+endif WIN32
 endif OMFONTS
 endif OTANGLE
 EXTRA_PROGRAMS = omfonts
@@ -62,6 +65,12 @@ omfonts_SOURCES = \
 LDADD = $(proglib) $(KPATHSEA_LIBS)
 omfonts_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND)
 
+call_omfonts_CPPFLAGS = -DEXEPROG=\"omfonts.exe\"
+
+call_omfonts_SOURCES = $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+
+call_omfonts_LDADD =
+
 DISTCLEANFILES = pl-parser.output
 
 linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf
@@ -69,11 +78,17 @@ linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf
 if OTANGLE
 if OMFONTS
 install-exec-hook:
+if WIN32
+	for f in $(linked_programs); do \
+	  $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
+	done
+else !WIN32
 	cd $(DESTDIR)$(bindir) && \
 	  for f in $(linked_programs); do \
 	    rm -f $$f$(EXEEXT) && \
 	    $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \
 	  done
+endif !WIN32
 uninstall-hook:
 	for f in $(linked_programs); do \
 	  rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 899551a5ea3..7e5f6f5f3a0 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -36,6 +36,8 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = $(am__EXEEXT_1)
 @OMFONTS_TRUE@@OTANGLE_TRUE@am__append_1 = omfonts
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@noinst_PROGRAMS =  \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	call_omfonts$(EXEEXT)
 EXTRA_PROGRAMS = omfonts$(EXEEXT)
 subdir = omegafonts
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \
@@ -81,7 +83,10 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 @OMFONTS_TRUE@@OTANGLE_TRUE@am__EXEEXT_1 = omfonts$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am_call_omfonts_OBJECTS = call_omfonts-callexe.$(OBJEXT)
+call_omfonts_OBJECTS = $(am_call_omfonts_OBJECTS)
+call_omfonts_DEPENDENCIES =
 am_omfonts_OBJECTS = char_routines.$(OBJEXT) dimen_routines.$(OBJEXT) \
 	error_routines.$(OBJEXT) extra_routines.$(OBJEXT) \
 	font_routines.$(OBJEXT) header_routines.$(OBJEXT) \
@@ -115,8 +120,8 @@ YLWRAP = $(top_srcdir)/../../build-aux/ylwrap
 YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
 LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
-SOURCES = $(omfonts_SOURCES)
-DIST_SOURCES = $(omfonts_SOURCES)
+SOURCES = $(call_omfonts_SOURCES) $(omfonts_SOURCES)
+DIST_SOURCES = $(call_omfonts_SOURCES) $(omfonts_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -311,7 +316,7 @@ top_srcdir = @top_srcdir@
 wlibs = @wlibs@
 x_ext_lib = @x_ext_lib@
 x_tool_libs = @x_tool_libs@
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C
 AM_CFLAGS = $(WARNING_CFLAGS)
 AM_YFLAGS = -d -v
 proglib = ../lib/lib.a
@@ -352,6 +357,9 @@ omfonts_SOURCES = \
 
 LDADD = $(proglib) $(KPATHSEA_LIBS)
 omfonts_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND)
+call_omfonts_CPPFLAGS = -DEXEPROG=\"omfonts.exe\"
+call_omfonts_SOURCES = $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+call_omfonts_LDADD = 
 DISTCLEANFILES = pl-parser.output tests/charwdr.* tests/charwdv.* \
 	tests/xlevel1.ofm tests/xlevel1.opl tests/Cherokee.tfm \
 	tests/OCherokee.ofm tests/OCherokee.opl tests/OCherokee.ovf \
@@ -441,6 +449,18 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+call_omfonts$(EXEEXT): $(call_omfonts_OBJECTS) $(call_omfonts_DEPENDENCIES) 
+	@rm -f call_omfonts$(EXEEXT)
+	$(LINK) $(call_omfonts_OBJECTS) $(call_omfonts_LDADD) $(LIBS)
 pl-parser.h: pl-parser.c
 	@if test ! -f $@; then \
 	  rm -f pl-parser.c; \
@@ -456,6 +476,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_omfonts-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/char_routines.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dimen_routines.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error_routines.Po@am__quote@
@@ -494,6 +515,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+call_omfonts-callexe.o: $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_omfonts-callexe.o -MD -MP -MF $(DEPDIR)/call_omfonts-callexe.Tpo -c -o call_omfonts-callexe.o `test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(top_srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_omfonts-callexe.Tpo $(DEPDIR)/call_omfonts-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/../texlive/w32_wrapper/callexe.c' object='call_omfonts-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_omfonts-callexe.o `test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(top_srcdir)/../texlive/w32_wrapper/callexe.c
+
+call_omfonts-callexe.obj: $(top_srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_omfonts-callexe.obj -MD -MP -MF $(DEPDIR)/call_omfonts-callexe.Tpo -c -o call_omfonts-callexe.obj `if test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_omfonts-callexe.Tpo $(DEPDIR)/call_omfonts-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/../texlive/w32_wrapper/callexe.c' object='call_omfonts-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_omfonts-callexe.obj `if test -f '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+
 .l.c:
 	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
 
@@ -723,7 +758,8 @@ maintainer-clean-generic:
 @OTANGLE_FALSE@uninstall-hook:
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -796,19 +832,19 @@ uninstall-am: uninstall-binPROGRAMS
 .MAKE: check-am install-am install-exec-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir 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 maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-hook
+	clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir 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 maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-hook
 
 
 # Rebuild $(proglib)
@@ -818,11 +854,14 @@ $(proglib): ${top_srcdir}/lib/*.c
 @KPATHSEA_RULE@
 
 @OMFONTS_TRUE@@OTANGLE_TRUE@install-exec-hook:
-@OMFONTS_TRUE@@OTANGLE_TRUE@	cd $(DESTDIR)$(bindir) && \
-@OMFONTS_TRUE@@OTANGLE_TRUE@	  for f in $(linked_programs); do \
-@OMFONTS_TRUE@@OTANGLE_TRUE@	    rm -f $$f$(EXEEXT) && \
-@OMFONTS_TRUE@@OTANGLE_TRUE@	    $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \
-@OMFONTS_TRUE@@OTANGLE_TRUE@	  done
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	for f in $(linked_programs); do \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	  $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	done
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	cd $(DESTDIR)$(bindir) && \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	  for f in $(linked_programs); do \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	    rm -f $$f$(EXEEXT) && \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	    $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	  done
 @OMFONTS_TRUE@@OTANGLE_TRUE@uninstall-hook:
 @OMFONTS_TRUE@@OTANGLE_TRUE@	for f in $(linked_programs); do \
 @OMFONTS_TRUE@@OTANGLE_TRUE@	  rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \