fix $(EXEEXT) problems

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

3 files changed, 26 insertions, 1 deletions

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) \