fix $(EXEEXT) problems

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

13 files changed, 308 insertions, 226 deletions

diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 3b5c99d332d..ebcad54cd25 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -14,6 +14,7 @@ SUBDIRS += otps
 proglib = lib/lib.a
 
 ## Below we will add to these
+EXTRA_PROGRAMS =
 bin_PROGRAMS =
 noinst_PROGRAMS =
 dist_man_MANS =
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 1b7d5c025ad..d8936ce70aa 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -33,12 +33,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @OMFONTS_TRUE@am__append_1 = omegafonts
-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_2) \
-	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_3) \
-	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
-	$(am__EXEEXT_7) $(am__EXEEXT_8) ttf2afm$(EXEEXT) \
-	pdftosrc$(EXEEXT) $(am__EXEEXT_9) $(am__EXEEXT_11) \
-	$(am__EXEEXT_13) $(am__EXEEXT_14) synctex$(EXEEXT)
+EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
+	mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) pdftex$(EXEEXT) \
+	luatex$(EXEEXT) luatangle$(EXEEXT) $(am__EXEEXT_4) \
+	aleph$(EXEEXT)
+bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
+	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+	$(am__EXEEXT_10) $(am__EXEEXT_11) ttf2afm$(EXEEXT) \
+	pdftosrc$(EXEEXT) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+	$(am__EXEEXT_14) $(am__EXEEXT_15) synctex$(EXEEXT)
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT)
 check_PROGRAMS = md5main$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
@@ -64,32 +68,34 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
 	../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \
 	ChangeLog INSTALL NEWS
-@WEB_TRUE@am__append_2 = $(web_programs)
-@TEX_TRUE@am__append_3 = tex
-@MF_TRUE@am__append_4 = mf
-@MFN_TRUE@am__append_5 = mf-nowin
-@MP_TRUE@am__append_6 = mpost
-@ETEX_TRUE@am__append_7 = etex
-@PDFTEX_TRUE@am__append_8 = pdftex
-@LUATEX_TRUE@am__append_9 = luatex luatangle
-@MINGW32_FALSE@am__append_10 = -DLUA_USE_POSIX
-@LUATEX_TRUE@am__append_11 = luatexdir/luatangle.test
-@OTANGLE_TRUE@am__append_12 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_13 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_14 = omegaware/otangle.test
-@ALEPH_TRUE@am__append_15 = aleph
-@TEX_SYNCTEX_TRUE@am__append_16 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-@TEX_SYNCTEX_TRUE@am__append_17 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_18 = \
+@HAVE_EXEEXT_TRUE@am__append_2 = tangle tangleboot ctangle ctangleboot \
+@HAVE_EXEEXT_TRUE@	luatangle otangle
+@WEB_TRUE@am__append_3 = $(web_programs)
+@TEX_TRUE@am__append_4 = tex
+@MF_TRUE@am__append_5 = mf
+@MFN_TRUE@@MF_TRUE@am__append_6 = mf-nowin
+@MP_TRUE@am__append_7 = mpost
+@ETEX_TRUE@am__append_8 = etex
+@PDFTEX_TRUE@am__append_9 = pdftex
+@LUATEX_TRUE@am__append_10 = luatex luatangle
+@MINGW32_FALSE@am__append_11 = -DLUA_USE_POSIX
+@LUATEX_TRUE@am__append_12 = luatexdir/luatangle.test
+@OTANGLE_TRUE@am__append_13 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_14 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_15 = omegaware/otangle.test
+@ALEPH_TRUE@am__append_16 = aleph
+@TEX_SYNCTEX_TRUE@am__append_17 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+@TEX_SYNCTEX_TRUE@am__append_18 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_19 = \
 @TEX_SYNCTEX_TRUE@	synctex.c
 
-@ETEX_SYNCTEX_TRUE@am__append_19 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-@ETEX_SYNCTEX_TRUE@am__append_20 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_21 = \
+@ETEX_SYNCTEX_TRUE@am__append_20 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+@ETEX_SYNCTEX_TRUE@am__append_21 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_22 = \
 @ETEX_SYNCTEX_TRUE@	synctex-e.c
 
-@PDFTEX_SYNCTEX_TRUE@am__append_22 = -I$(srcdir)/synctexdir
-@PDFTEX_SYNCTEX_TRUE@am__append_23 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_23 = -I$(srcdir)/synctexdir
+@PDFTEX_SYNCTEX_TRUE@am__append_24 = \
 @PDFTEX_SYNCTEX_TRUE@	synctex-pdf.c
 
 subdir = .
@@ -291,20 +297,21 @@ am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitomp$(EXEEXT) \
 	gftype$(EXEEXT) mft$(EXEEXT) patgen$(EXEEXT) pktogf$(EXEEXT) \
 	pktype$(EXEEXT) pltotf$(EXEEXT) pooltype$(EXEEXT) \
 	tftopl$(EXEEXT) vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT)
-@WEB_TRUE@am__EXEEXT_2 = $(am__EXEEXT_1)
-@TEX_TRUE@am__EXEEXT_3 = tex$(EXEEXT)
-@MF_TRUE@am__EXEEXT_4 = mf$(EXEEXT)
-@MFN_TRUE@am__EXEEXT_5 = mf-nowin$(EXEEXT)
-@MP_TRUE@am__EXEEXT_6 = mpost$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_7 = etex$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_8 = pdftex$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_9 = luatex$(EXEEXT) luatangle$(EXEEXT)
-am__EXEEXT_10 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_11 = $(am__EXEEXT_10)
-am__EXEEXT_12 = ofm2opl$(EXEEXT) opl2ofm$(EXEEXT) ovf2ovp$(EXEEXT) \
+am__EXEEXT_2 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT)
+am__EXEEXT_3 = ofm2opl$(EXEEXT) opl2ofm$(EXEEXT) ovf2ovp$(EXEEXT) \
 	ovp2ovf$(EXEEXT)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_13 = $(am__EXEEXT_12)
-@ALEPH_TRUE@am__EXEEXT_14 = aleph$(EXEEXT)
+am__EXEEXT_4 = $(am__EXEEXT_2) $(am__EXEEXT_3)
+@WEB_TRUE@am__EXEEXT_5 = $(am__EXEEXT_1)
+@TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
+@MF_TRUE@am__EXEEXT_7 = mf$(EXEEXT)
+@MFN_TRUE@@MF_TRUE@am__EXEEXT_8 = mf-nowin$(EXEEXT)
+@MP_TRUE@am__EXEEXT_9 = mpost$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_10 = etex$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_11 = pdftex$(EXEEXT)
+@LUATEX_TRUE@am__EXEEXT_12 = luatex$(EXEEXT) luatangle$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_13 = $(am__EXEEXT_2)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_14 = $(am__EXEEXT_3)
+@ALEPH_TRUE@am__EXEEXT_15 = aleph$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man5dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -780,7 +787,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = ctiedir/ctie.1 tiedir/tie.1
 dist_check_SCRIPTS = tangle.test luatexdir/luatangle.test \
 	omegaware/otangle.test libmd5/md5.test
-TESTS = tangle.test tiedir/tie.test $(am__append_11) $(am__append_14) \
+TESTS = tangle.test tiedir/tie.test $(am__append_12) $(am__append_15) \
 	libmd5/md5.test
 EXTRA_LIBRARIES = libmf.a libmpost.a libpdftex.a liblua51.a libzzip.a \
 	libluasocket.a libluamisc.a libff.a libluatex.a libmd5.a
@@ -987,7 +994,7 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
 	cftest.p $(nodist_aleph_SOURCES) aleph.web aleph.ch \
 	aleph-web2c aleph.p aleph.pool aleph-tangle
-CLEANFILES = 
+CLEANFILES = $(am__append_2)
 web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert
 makecpool = ./web2c/makecpool
 web2c_common = web2c/convert web2c/common.defines
@@ -1032,10 +1039,10 @@ nodist_weave_SOURCES = weave.c weave.h
 nodist_ctie_SOURCES = ctie.c
 nodist_cweave_SOURCES = cweave.c cweb.c
 nodist_tie_SOURCES = tie.c
-tex_CPPFLAGS = $(am__append_16)
-tex_LDADD = $(LDADD) $(socketlibs) $(am__append_17)
+tex_CPPFLAGS = $(am__append_17)
+tex_LDADD = $(LDADD) $(socketlibs) $(am__append_18)
 tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_18)
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_19)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -1071,11 +1078,11 @@ libmpost_a_SOURCES = \
 	mpdir/writefont.c \
 	mpdir/writet1.c
 
-etex_CPPFLAGS = $(am__append_19)
-etex_LDADD = $(LDADD) $(socketlibs) $(am__append_20)
+etex_CPPFLAGS = $(am__append_20)
+etex_LDADD = $(LDADD) $(socketlibs) $(am__append_21)
 etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \
-	etexdir/etexextra.h $(am__append_21)
+	etexdir/etexextra.h $(am__append_22)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -1098,12 +1105,12 @@ pdftex_dependencies = $(proglib) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) \
 	$(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_22)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_23)
 pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(socketlibs)
 pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
 pdftex_c_h = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \
-	pdftexdir/pdftexextra.h $(am__append_23)
+	pdftexdir/pdftexextra.h $(am__append_24)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -1170,7 +1177,7 @@ nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luat
 luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch
 nodist_luatangle_SOURCES = luatangle.c luatangle.h
 luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_10)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_11)
 liblua51_a_SOURCES = \
 	luatexdir/lua51/lapi.c \
 	luatexdir/lua51/lapi.h \
@@ -1833,12 +1840,12 @@ aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES)
 bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) 
 	@rm -f bibtex$(EXEEXT)
 	$(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS)
-ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) 
-	@rm -f ctangle$(EXEEXT)
-	$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
-ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) 
-	@rm -f ctangleboot$(EXEEXT)
-	$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
+@HAVE_EXEEXT_FALSE@ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) 
+@HAVE_EXEEXT_FALSE@	@rm -f ctangle$(EXEEXT)
+@HAVE_EXEEXT_FALSE@	$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
+@HAVE_EXEEXT_FALSE@ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) 
+@HAVE_EXEEXT_FALSE@	@rm -f ctangleboot$(EXEEXT)
+@HAVE_EXEEXT_FALSE@	$(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS)
 ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) 
 	@rm -f ctie$(EXEEXT)
 	$(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS)
@@ -1866,9 +1873,9 @@ gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES)
 gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) 
 	@rm -f gftype$(EXEEXT)
 	$(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS)
-luatangle$(EXEEXT): $(luatangle_OBJECTS) $(luatangle_DEPENDENCIES) 
-	@rm -f luatangle$(EXEEXT)
-	$(LINK) $(luatangle_OBJECTS) $(luatangle_LDADD) $(LIBS)
+@HAVE_EXEEXT_FALSE@luatangle$(EXEEXT): $(luatangle_OBJECTS) $(luatangle_DEPENDENCIES) 
+@HAVE_EXEEXT_FALSE@	@rm -f luatangle$(EXEEXT)
+@HAVE_EXEEXT_FALSE@	$(LINK) $(luatangle_OBJECTS) $(luatangle_LDADD) $(LIBS)
 luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) 
 	@rm -f luatex$(EXEEXT)
 	$(CXXLINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS)
@@ -1899,9 +1906,9 @@ ofm2opl$(EXEEXT): $(ofm2opl_OBJECTS) $(ofm2opl_DEPENDENCIES)
 opl2ofm$(EXEEXT): $(opl2ofm_OBJECTS) $(opl2ofm_DEPENDENCIES) 
 	@rm -f opl2ofm$(EXEEXT)
 	$(LINK) $(opl2ofm_OBJECTS) $(opl2ofm_LDADD) $(LIBS)
-otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) 
-	@rm -f otangle$(EXEEXT)
-	$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+@HAVE_EXEEXT_FALSE@otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) 
+@HAVE_EXEEXT_FALSE@	@rm -f otangle$(EXEEXT)
+@HAVE_EXEEXT_FALSE@	$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
 ovf2ovp$(EXEEXT): $(ovf2ovp_OBJECTS) $(ovf2ovp_DEPENDENCIES) 
 	@rm -f ovf2ovp$(EXEEXT)
 	$(LINK) $(ovf2ovp_OBJECTS) $(ovf2ovp_LDADD) $(LIBS)
@@ -1932,12 +1939,12 @@ pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES)
 synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) 
 	@rm -f synctex$(EXEEXT)
 	$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
-tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) 
-	@rm -f tangle$(EXEEXT)
-	$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
-tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) 
-	@rm -f tangleboot$(EXEEXT)
-	$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+@HAVE_EXEEXT_FALSE@tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) 
+@HAVE_EXEEXT_FALSE@	@rm -f tangle$(EXEEXT)
+@HAVE_EXEEXT_FALSE@	$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
+@HAVE_EXEEXT_FALSE@tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) 
+@HAVE_EXEEXT_FALSE@	@rm -f tangleboot$(EXEEXT)
+@HAVE_EXEEXT_FALSE@	$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
 tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) 
 	@rm -f tex$(EXEEXT)
 	$(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS)
@@ -7024,6 +7031,8 @@ tangle.web:
 	@echo "In any case, you can get it from" >&2
 	@echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
 	false
+@HAVE_EXEEXT_TRUE@tangle: tangle$(EXEEXT)
+@HAVE_EXEEXT_TRUE@	echo timestamp >$@
 tangleboot.c tangleboot.h: stamp-tangle $(web2c_programs) $(web2c_common)
 	$(web2c) tangleboot
 stamp-tangle: tangleboot.p
@@ -7039,10 +7048,14 @@ tangleboot.p: tangle.web tangle.ch
 	fi
 	date >stamp-tangle
 	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
+@HAVE_EXEEXT_TRUE@tangleboot: tangleboot$(EXEEXT)
+@HAVE_EXEEXT_TRUE@	echo timestamp >$@
 ctangle.c: ctangleboot cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) ctangle ctang-w2c
 cweb.c: ctangleboot cwebdir/common.w cwebdir/comm-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c
+@HAVE_EXEEXT_TRUE@ctangle: ctangle$(EXEEXT)
+@HAVE_EXEEXT_TRUE@	echo timestamp >$@
 stamp-ctangle: ctangleboot.c cwebboot.c
 	date >stamp-ctangle
 ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch
@@ -7067,6 +7080,8 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	fi
 	date >stamp-ctangle
 	$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
+@HAVE_EXEEXT_TRUE@ctangleboot: ctangleboot$(EXEEXT)
+@HAVE_EXEEXT_TRUE@	echo timestamp >$@
 bibtex.c bibtex.h: bibtex-web2c
 bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p
 	$(web2c) bibtex
@@ -7321,6 +7336,8 @@ luatangle.c luatangle.h: $(web2c_common) $(web2c_programs) luatangle.p
 	$(web2c) luatangle
 luatangle.p: tangle $(luatangle_sources)
 	WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle
+@HAVE_EXEEXT_TRUE@luatangle: luatangle$(EXEEXT)
+@HAVE_EXEEXT_TRUE@	echo timestamp >$@
 
 @LUATEX_TRUE@$(libluatex_a_SOURCES): $(lua_mp_c_h)
 $(lua_mp_c_h): mp-ctangle
@@ -7369,6 +7386,8 @@ otangle-web2c: $(web2c_common) $(web2c_programs) otangle.p
 	touch otangle.c otangle.h
 otangle.p: tangle $(otangle_sources)
 	$(ow_tangle) otangle otangle
+@HAVE_EXEEXT_TRUE@otangle: otangle$(EXEEXT)
+@HAVE_EXEEXT_TRUE@	echo timestamp >$@
 ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
 ovf2ovp-web2c: $(web2c_common) $(web2c_programs) ovf2ovp.p
 	$(web2c) ovf2ovp
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index 1643770a4d0..f658f50d07d 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -5,6 +5,7 @@
 if ALEPH
 bin_PROGRAMS += aleph
 endif ALEPH
+EXTRA_PROGRAMS += aleph
 
 ## With --enable-ipc, Aleph may need to link with -lsocket.
 aleph_LDADD = $(LDADD) $(socketlibs)
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index a8395d1870f..734d059c83b 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -27,6 +27,11 @@ tangle.web:
 	@echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
 	false
 DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c
+if HAVE_EXEEXT
+tangle: tangle$(EXEEXT)
+	echo timestamp >$@
+CLEANFILES += tangle
+endif HAVE_EXEEXT
 
 noinst_PROGRAMS += tangleboot
 nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
@@ -51,6 +56,11 @@ tangleboot.p: tangle.web tangle.ch
 	date >stamp-tangle
 	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
 DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h
+if HAVE_EXEEXT
+tangleboot: tangleboot$(EXEEXT)
+	echo timestamp >$@
+CLEANFILES += tangleboot
+endif HAVE_EXEEXT
 
 ## Bootstrapping ctangle requires making it with itself.  We use the opportunity
 ## to create an up-to-date ctangleboot as well.
@@ -66,6 +76,11 @@ ctangle.c: ctangleboot cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 cweb.c: ctangleboot cwebdir/common.w cwebdir/comm-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c
 DISTCLEANFILES += ctangle.c cweb.c
+if HAVE_EXEEXT
+ctangle: ctangle$(EXEEXT)
+	echo timestamp >$@
+CLEANFILES += ctangle
+endif HAVE_EXEEXT
 
 noinst_PROGRAMS += ctangleboot
 nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
@@ -99,6 +114,11 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	date >stamp-ctangle
 	$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
 DISTCLEANFILES += stamp-ctangle
+if HAVE_EXEEXT
+ctangleboot: ctangleboot$(EXEEXT)
+	echo timestamp >$@
+CLEANFILES += ctangleboot
+endif HAVE_EXEEXT
 
 ## Tests
 
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 8d65e7bd065..b43eeeed711 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -14,6 +14,7 @@ EXTRA_DIST += \
 if TEX
 bin_PROGRAMS += tex
 endif TEX
+EXTRA_PROGRAMS += tex
 
 tex_CPPFLAGS =
 
@@ -55,13 +56,16 @@ DISTCLEANFILES += $(nodist_tex_SOURCES) tex-final.ch tex-web2c \
 ##
 if MF
 bin_PROGRAMS += mf
+if MFN
+bin_PROGRAMS += mf-nowin
+endif MFN
 endif MF
+EXTRA_PROGRAMS += mf mf-nowin
 
 nodist_mf_SOURCES = mfextra.c
 mf_CPPFLAGS = $(X_CFLAGS)
 mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
 if MFN
-bin_PROGRAMS += mf-nowin
 nodist_mf_nowin_SOURCES = mfextra.c
 mf_nowin_CPPFLAGS = $(X_CFLAGS) -DMFNOWIN
 mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index 951e4fded6c..809dfb61238 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -6,6 +6,7 @@ web_programs = bibtex dvicopy dvitomp dvitype gftodvi gftopk gftype mft \
 if WEB
 bin_PROGRAMS += $(web_programs)
 endif WEB
+EXTRA_PROGRAMS += $(web_programs)
 
 EXTRA_DIST += $(web_programs:=.web) $(web_programs:=.ch)
 DISTCLEANFILES += $(web_programs:=.c) $(web_programs:=.h) \
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index bd87cb57a84..c5153d02e20 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -797,10 +797,6 @@ CTANGLE
 CTANGLEBOOT
 TANGLE
 TANGLEBOOT
-MINGW32_FALSE
-MINGW32_TRUE
-WIN32_FALSE
-WIN32_TRUE
 OBSDCOMPAT_RULE
 OBSDCOMPAT_DEPEND
 OBSDCOMPAT_LIBS
@@ -874,6 +870,12 @@ TEX_SYNCTEX_TRUE
 TEX_FALSE
 TEX_TRUE
 socketlibs
+MINGW32_FALSE
+MINGW32_TRUE
+WIN32_FALSE
+WIN32_TRUE
+HAVE_EXEEXT_FALSE
+HAVE_EXEEXT_TRUE
 FMU_FALSE
 FMU_TRUE
 CXX_HACK_LIBS
@@ -4357,13 +4359,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4360: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4362: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4363: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4365: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4366: output\"" >&5)
+  (eval echo "\"\$as_me:4368: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5569,7 +5571,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5572 "configure"' > conftest.$ac_ext
+  echo '#line 5574 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7616,11 +7618,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7619: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7621: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7623: \$? = $ac_status" >&5
+   echo "$as_me:7625: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7955,11 +7957,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7958: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7960: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7962: \$? = $ac_status" >&5
+   echo "$as_me:7964: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8060,11 +8062,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8063: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8065: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8067: \$? = $ac_status" >&5
+   echo "$as_me:8069: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8115,11 +8117,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8118: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8120: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8122: \$? = $ac_status" >&5
+   echo "$as_me:8124: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10915,7 +10917,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10918 "configure"
+#line 10920 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11011,7 +11013,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11014 "configure"
+#line 11016 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16027,11 +16029,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16032: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16034: \$? = $ac_status" >&5
+   echo "$as_me:16036: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16126,11 +16128,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16129: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16131: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16133: \$? = $ac_status" >&5
+   echo "$as_me:16135: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16178,11 +16180,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16181: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16183: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16185: \$? = $ac_status" >&5
+   echo "$as_me:16187: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17688,6 +17690,128 @@ else
 fi
 
 
+ if test "x$(EXEEXT)" != x ; then
+  HAVE_EXEEXT_TRUE=
+  HAVE_EXEEXT_FALSE='#'
+else
+  HAVE_EXEEXT_TRUE='#'
+  HAVE_EXEEXT_FALSE=
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if test "${kpse_cv_have_win32+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef WIN32
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __MINGW32__
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  kpse_cv_have_win32=mingw32
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	kpse_cv_have_win32=native
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	kpse_cv_have_win32=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$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 "x$kpse_cv_have_win32" = xmingw32; then
+  MINGW32_TRUE=
+  MINGW32_FALSE='#'
+else
+  MINGW32_TRUE='#'
+  MINGW32_FALSE=
+fi
+
+
 # -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
 # See ac_path_xtra.
 if test "x$enable_ipc:$enable_luatex" != xno:no; then
@@ -22863,119 +22987,6 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for native WIN32 or MINGW32" >&5
-$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
-if test "${kpse_cv_have_win32+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef WIN32
-  choke me
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __MINGW32__
-  choke me
-#endif
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  kpse_cv_have_win32=mingw32
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	kpse_cv_have_win32=native
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	kpse_cv_have_win32=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$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 "x$kpse_cv_have_win32" = xmingw32; then
-  MINGW32_TRUE=
-  MINGW32_FALSE='#'
-else
-  MINGW32_TRUE='#'
-  MINGW32_FALSE=
-fi
-
-
 if test "x$enable_luatex" = xyes; then
   ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-config.in"
 
@@ -23946,6 +23957,27 @@ $as_echo "$as_me: error: conditional \"FMU\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_EXEEXT_TRUE}" && test -z "${HAVE_EXEEXT_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_EXEEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_EXEEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${MINGW32_TRUE}" && test -z "${MINGW32_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${TEX_TRUE}" && test -z "${TEX_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"TEX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -24086,20 +24118,6 @@ $as_echo "$as_me: error: conditional \"WEB\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${MINGW32_TRUE}" && test -z "${MINGW32_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MINGW32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MINGW32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index c79ce23e452..614c01c8470 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -61,6 +61,12 @@ AS_IF([test "x$enable_dump_share" = xno],
 
 AM_CONDITIONAL([FMU], [test "x$enable_fmtutil" = xyes])
 
+AM_CONDITIONAL([HAVE_EXEEXT], [test "x$(EXEEXT)" != x ])
+
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
+
 # -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
 # See ac_path_xtra.
 AS_IF([test "x$enable_ipc:$enable_luatex" != xno:no], [
@@ -222,10 +228,6 @@ AH_TOP([/* c-auto.h: defines for web2c, as determined by configure.
 #define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"])
 AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */])
 
-KPSE_CHECK_WIN32
-AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
-AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
-
 AS_IF([test "x$enable_luatex" = xyes],
 [AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in])
 AC_CHECK_HEADERS([langinfo_h])
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index e334bc23b3f..9ec5f82e154 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -5,6 +5,7 @@
 if ETEX
 bin_PROGRAMS += etex
 endif ETEX
+EXTRA_PROGRAMS += etex
 
 etex_CPPFLAGS =
 
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index f7e35d1010b..04b3a0d7033 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -5,6 +5,7 @@
 if LUATEX
 bin_PROGRAMS += luatex
 endif LUATEX
+EXTRA_PROGRAMS += luatex
 
 ## Force Automake to use CXXLD for linking
 nodist_EXTRA_luatex_SOURCES = dummy.cxx
@@ -65,6 +66,7 @@ DISTCLEANFILES += $(nodist_luatex_SOURCES) luatex-web2c \
 if LUATEX
 bin_PROGRAMS += luatangle
 endif LUATEX
+EXTRA_PROGRAMS += luatangle
 
 nodist_luatangle_SOURCES = luatangle.c luatangle.h
 luatangle.c luatangle.h: $(web2c_common) $(web2c_programs) luatangle.p
@@ -74,6 +76,11 @@ luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch
 luatangle.p: tangle $(luatangle_sources)
 	WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle
 DISTCLEANFILES += luatangle.c luatangle.h luatangle.p
+if HAVE_EXEEXT
+luatangle: luatangle$(EXEEXT)
+	echo timestamp >$@
+CLEANFILES += luatangle
+endif HAVE_EXEEXT
 
 ## liblua51
 ##
diff --git a/Build/source/texk/web2c/mpdir/am/mp.am b/Build/source/texk/web2c/mpdir/am/mp.am
index eb89d5b0e96..1240c4f0d06 100644
--- a/Build/source/texk/web2c/mpdir/am/mp.am
+++ b/Build/source/texk/web2c/mpdir/am/mp.am
@@ -5,6 +5,7 @@
 if MP
 bin_PROGRAMS += mpost
 endif MP
+EXTRA_PROGRAMS += mpost
 
 mpost_CPPFLAGS = -I$(srcdir)/mpdir
 mpost_LDADD = libmpost.a $(LDADD)
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index acb4102d308..24599f8b82d 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -10,6 +10,7 @@ if !OMFONTS
 bin_PROGRAMS += $(omegaware_font_tools)
 endif !OMFONTS
 endif OTANGLE
+EXTRA_PROGRAMS += $(omegaware_programs)
 
 EXTRA_DIST += omegaware/ChangeLog
 DISTCLEANFILES += $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
@@ -71,6 +72,11 @@ EXTRA_DIST += $(otangle_sources)
 otangle_sources = omegaware/otangle.web omegaware/otangle.ch
 otangle.p: tangle $(otangle_sources)
 	$(ow_tangle) otangle otangle
+if HAVE_EXEEXT
+otangle: otangle$(EXEEXT)
+	echo timestamp >$@
+CLEANFILES += otangle
+endif HAVE_EXEEXT
 
 nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
 ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index a47e6fcd233..73e4dbc0053 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -16,6 +16,7 @@ pdftex_dependencies += $(OBSDCOMPAT_DEPEND) libmd5.a
 if PDFTEX
 bin_PROGRAMS += pdftex
 endif PDFTEX
+EXTRA_PROGRAMS += pdftex
 
 ## Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx