fix various build problems: -lsocket, -liconv, foo.exe vs. foo

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

53 files changed, 580 insertions, 174 deletions

diff --git a/Build/source/WARNING b/Build/source/WARNING
index 8b24239a4ae..ad7fab415f9 100644
--- a/Build/source/WARNING
+++ b/Build/source/WARNING
@@ -13,13 +13,23 @@ problems.
 
 Please try ./Build for your system and tell me about any failures.
 
+Make sure to use GNU Make (an Automake generated Makefile is supposed not to
+require GNU Make, but that seems not to be the case).
+
+If /bin/sh on your system can not handle command substitutions such as
+'$(COMMAND)' and XSI constructs such as 'VAR+=VAL', you must set
+CONFIG_SHELL to a shell that does.  Due to a bug in current Autoconf this
+should be done both in the environment and on the command line, e.g.,
+	CONFIG_SHELL=/bin/bash ./Build CONFIG_SHELL=/bin/bash
+(assuming bourne shell syntax).
+
 If building a particular subdirectory, e.g., texk/xdvik/ fails, try
 	TL_CONFIGURE_ARGS='--disable-xdvik' ./Build
-(assuming a bourne compatible shell).
+(again assuming bourne shell syntax).
 
 If there are problems with the cxx-runtime-hack (gcc only), please try adding
 '--disable-cxx-runtime-hack' to TL_CONFIGURE_ARGS.
 
 Good luck!
 
-Peter Breitenlohner	<peb@mppmu.mpg.de>	2009-04-24	15:00 UTC
+Peter Breitenlohner	<peb@mppmu.mpg.de>	2009-04-28	09:00 UTC
diff --git a/Build/source/m4/kpse-socket-libs.m4 b/Build/source/m4/kpse-socket-libs.m4
index 9a942e938ac..c768b95fad6 100644
--- a/Build/source/m4/kpse-socket-libs.m4
+++ b/Build/source/m4/kpse-socket-libs.m4
@@ -14,7 +14,7 @@
 # Set ac_cv_search_connect as AC_SEARCH_LIBS([connect], [LIB...])
 # would do.
 # -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
-# See ac_path_xtra.
+# See AC_PATH_XTRA.
 # For WIN32 systems we need -lwsock32 but AC_SEARCH_LIBS would fail.
 AC_DEFUN([KPSE_CHECK_SOCKET_LIBS],
 [AC_REQUIRE([KPSE_CHECK_WIN32])
@@ -23,6 +23,6 @@ AS_IF([test "x$kpse_cv_have_win32" = xno],
        AC_SEARCH_LIBS([connect], [socket nsl])
        LIBS=$kpse_save_LIBS],
       [AC_CHECK_LIB([wsock32], [main],
-                    [ac_cv_search_connect=wsock32],
+                    [ac_cv_search_connect=-lwsock32],
                     [ac_cv_search_connect=no])])
 ]) # KPSE_CHECK_SOCKET_LIBS
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index 74f24361d89..5ca62ec01b6 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/ stamp-squeeze/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
@@ -86,16 +90,18 @@ texc.lpro: texc.script tex.lpro
 
 SUFFIXES = .pro .lpro
 
-## The `t[mp]-' business is so that we don't create an empty .pro file,
-## if running squeeze fails for some reason.  A dependency on squeeze
-## fails here, so we include it below.
+# The `t[mp]-' business is so that we don't create an empty .pro file,
+# if running squeeze fails for some reason.  A dependency on squeeze
+# fails here, so we include it below.
 .lpro.pro:
 	squeeze/squeeze <$< >t-$@ && mv t-$@ $@
 
-$(prologues): squeeze/squeeze$(EXEEXT)
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary file squeeze/stamp-squeeze.
+$(prologues): squeeze/stamp-squeeze
 
-squeeze/squeeze$(EXEEXT):
-	cd squeeze && $(MAKE) $(AM_MAKEFLAGS)
+squeeze/stamp-squeeze:
+	cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
 
 EXTRA_DIST = $(dist_prologues) texc.script
 
@@ -145,7 +151,7 @@ EXTRA_DIST += \
 	vmcms \
 	vms
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index 0ae6655819d..9a5e7b1c020 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -1177,13 +1177,18 @@ uninstall-man: uninstall-man1
 texc.lpro: texc.script tex.lpro
 	$(SHELL) $(srcdir)/texc.script $(srcdir)/tex.lpro $@
 
+# The `t[mp]-' business is so that we don't create an empty .pro file,
+# if running squeeze fails for some reason.  A dependency on squeeze
+# fails here, so we include it below.
 .lpro.pro:
 	squeeze/squeeze <$< >t-$@ && mv t-$@ $@
 
-$(prologues): squeeze/squeeze$(EXEEXT)
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary file squeeze/stamp-squeeze.
+$(prologues): squeeze/stamp-squeeze
 
-squeeze/squeeze$(EXEEXT):
-	cd squeeze && $(MAKE) $(AM_MAKEFLAGS)
+squeeze/stamp-squeeze:
+	cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
 
 install-data-hook:
 	cd $(DESTDIR)$(man1dir) && \
@@ -1197,6 +1202,7 @@ uninstall-hook:
 	rm -f $(DESTDIR)$(man1dir)/odvips.1
 	rm -f $(DESTDIR)$(bindir)/odvips
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/dvipsk/squeeze/Makefile.am b/Build/source/texk/dvipsk/squeeze/Makefile.am
index 6eb87efed39..48f10154c8e 100644
--- a/Build/source/texk/dvipsk/squeeze/Makefile.am
+++ b/Build/source/texk/dvipsk/squeeze/Makefile.am
@@ -1,5 +1,16 @@
+## Makefile.am for the TeX Live subdirectory texk/dvipsk/squeeze/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../../m4
 
 noinst_PROGRAMS = squeeze
 
+nodist_noinst_DATA = stamp-squeeze
+
+stamp-squeeze: squeeze$(EXEEXT)
+	echo timestamp >$@
+
+CLEANFILES = stamp-squeeze
+
diff --git a/Build/source/texk/dvipsk/squeeze/Makefile.in b/Build/source/texk/dvipsk/squeeze/Makefile.in
index 41d66c31d89..c6a79ae39d8 100644
--- a/Build/source/texk/dvipsk/squeeze/Makefile.in
+++ b/Build/source/texk/dvipsk/squeeze/Makefile.in
@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -62,6 +63,7 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = squeeze.c
 DIST_SOURCES = squeeze.c
+DATA = $(nodist_noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -159,6 +161,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../../m4
+nodist_noinst_DATA = stamp-squeeze
+CLEANFILES = stamp-squeeze
 all: all-am
 
 .SUFFIXES:
@@ -405,7 +409,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -424,6 +428,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -508,6 +513,9 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am
 
+
+stamp-squeeze: squeeze$(EXEEXT)
+	echo timestamp >$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index fafdfa5ab1e..bac787dcca0 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/kpathsea/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
diff --git a/Build/source/texk/kpathsea/doc/Makefile.am b/Build/source/texk/kpathsea/doc/Makefile.am
index daeaf375f4b..627b973400f 100644
--- a/Build/source/texk/kpathsea/doc/Makefile.am
+++ b/Build/source/texk/kpathsea/doc/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/kpathsea/doc/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 EXTRA_DIST = unixtex.ftp
 
diff --git a/Build/source/texk/kpathsea/man/Makefile.am b/Build/source/texk/kpathsea/man/Makefile.am
index b230160b9ba..d7db63f961e 100644
--- a/Build/source/texk/kpathsea/man/Makefile.am
+++ b/Build/source/texk/kpathsea/man/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/kpathsea/man/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 man_sources = \
 	kpseaccess.man \
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index a95cb43876d..3e84dbd0bc6 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
@@ -34,15 +38,18 @@ dist-hook:
 ## The sh script that does the conversion.
 web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert
 
-## We put this in the web2c directory for lack of a better place, but it
+## We put this in the web2c directory because it runs on the build system, it
 ## is separate from (and simpler than) the actual web-to-C conversion programs.
-makecpool = ./web2c/makecpool
+makecpool = web2c/makecpool
 
-## Additional dependencies:
+# Additional dependencies:
 web2c_common = web2c/convert web2c/common.defines
-web2c_programs = web2c/fixwrites web2c/splitup web2c/web2c $(makecpool)
-web2c_texmf = $(web2c_common) $(web2c_programs) \
-              web2c/texmf.defines web2c/coerce.h
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary files web2c/stamp-*.
+web2c_stamps = web2c/stamp-fixwrites web2c/stamp-splitup web2c/stamp-web2c
+makecpool_stamp = web2c/stamp-makecpool
+web2c_depend = $(web2c_common) $(web2c_stamps)
+web2c_texmf = $(web2c_depend) web2c/texmf.defines web2c/coerce.h
 
 ## This is right for most Web2C programs
 LDADD = $(proglib) $(KPATHSEA_LIBS)
@@ -55,9 +62,15 @@ LDADD = $(proglib) $(KPATHSEA_LIBS)
 $(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
 	cd lib && $(MAKE) $(AM_MAKEFLAGS)
 
-## Rebuild $(web2c_programs)
-$(web2c_programs): $(web2c_common) ${srcdir}/web2c/*.[chly]
-	cd web2c && $(MAKE) $(AM_MAKEFLAGS)
+## Rebuild Web2C programs
+web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites
+web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-splitup
+web2c/stamp-web2c: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-web2c
+web2c/stamp-makecpool: $(web2c_common) ${srcdir}/web2c/makecpool.c
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-makecpool
 
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index f92d0c80216..0cb786f5bdd 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1166,12 +1166,16 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = 
 web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert
-makecpool = ./web2c/makecpool
-web2c_common = web2c/convert web2c/common.defines
-web2c_programs = web2c/fixwrites web2c/splitup web2c/web2c $(makecpool)
-web2c_texmf = $(web2c_common) $(web2c_programs) \
-              web2c/texmf.defines web2c/coerce.h
+makecpool = web2c/makecpool
 
+# Additional dependencies:
+web2c_common = web2c/convert web2c/common.defines
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary files web2c/stamp-*.
+web2c_stamps = web2c/stamp-fixwrites web2c/stamp-splitup web2c/stamp-web2c
+makecpool_stamp = web2c/stamp-makecpool
+web2c_depend = $(web2c_common) $(web2c_stamps)
+web2c_texmf = $(web2c_depend) web2c/texmf.defines web2c/coerce.h
 LDADD = $(proglib) $(KPATHSEA_LIBS)
 buildenv = TEXMFCNF=$(srcdir)/../kpathsea
 tangle = WEBINPUTS=.:$(srcdir) $(buildenv) $(TANGLE)
@@ -1210,7 +1214,11 @@ nodist_ctie_SOURCES = ctie.c
 nodist_cweave_SOURCES = cweave.c cweb.c
 nodist_tie_SOURCES = tie.c
 tex_CPPFLAGS = $(am__append_29)
+
+# With --enable-ipc, TeX may need to link with -lsocket.
 tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_30)
+
+# TeX C sources
 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_31)
 tex_ch_srcs = \
@@ -1227,6 +1235,8 @@ mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs)
 @MFN_TRUE@mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
 windowlib = window/libwindow.a
 mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS)
+
+# Metafont C sources
 mf_c_h = mfini.c mf0.c mf1.c mfcoerce.h mfd.h
 nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c
 libmf_a_CPPFLAGS = -DMETA_FONT
@@ -1265,7 +1275,11 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/memio.w mplibdir/tfmin.w
 etex_CPPFLAGS = $(am__append_32)
+
+# With --enable-ipc, e-TeX may need to link with -lsocket.
 etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_33)
+
+# e-TeX C sources
 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_34)
@@ -7853,8 +7867,14 @@ dist-hook:
 $(proglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
 	cd lib && $(MAKE) $(AM_MAKEFLAGS)
 
-$(web2c_programs): $(web2c_common) ${srcdir}/web2c/*.[chly]
-	cd web2c && $(MAKE) $(AM_MAKEFLAGS)
+web2c/stamp-fixwrites: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-fixwrites
+web2c/stamp-splitup: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-splitup
+web2c/stamp-web2c: $(web2c_common) ${srcdir}/web2c/*.[chly]
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-web2c
+web2c/stamp-makecpool: $(web2c_common) ${srcdir}/web2c/makecpool.c
+	cd web2c && $(MAKE) $(AM_MAKEFLAGS) stamp-makecpool
 
 @KPATHSEA_RULE@
 @ZLIB_RULE@
@@ -7872,6 +7892,10 @@ tangle-web2c: tangle.p
 	$(web2c) tangle
 	echo timestamp >$@
 	touch tangle.c tangle.h
+# tangle.p is a special case, since it is needed to compile itself.  We
+# convert and compile the (distributed) tangleboot.p to make a tangle
+# which we use to make the other programs.  We depend on tangleboot, even
+# though we might not use it.
 tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
 	WEBINPUTS=.:$(srcdir) $(tangleboot) tangle tangle
 tangle.web:
@@ -7884,10 +7908,14 @@ tangle.web:
 	@echo "In any case, you can get it from" >&2
 	@echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
 	false
-tangleboot.c tangleboot.h: stamp-tangle $(web2c_programs) $(web2c_common)
+tangleboot.c tangleboot.h: stamp-tangle $(web2c_depend)
 	$(web2c) tangleboot
+# tangleboot.p is in the distribution
 stamp-tangle: tangleboot.p
 	date >stamp-tangle
+# This is not run unless tangle.web or tangle.ch is changed.
+# Only try to run ./tangle if it actually exists, otherwise
+# just touch tangleboot.p and build tangle.
 tangleboot.p: tangle.web tangle.ch
 	if [ -r $(TANGLE) ] || [ -r $(TANGLE).exe ]; then \
 	  $(tangle) tangle tangle; \
@@ -7899,12 +7927,19 @@ tangleboot.p: tangle.web tangle.ch
 	fi
 	date >stamp-tangle
 	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
+# ctangle.c is a special case, since it is needed to compile itself.
+# We depend on ctangleboot, even though we might not use it.
 ctangle.c: ctangleboot$(EXEEXT) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) ctangle ctang-w2c
 cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c
+# ctangleboot.c and cwebboot.c are in the distribution
 stamp-ctangle: ctangleboot.c cwebboot.c
 	date >stamp-ctangle
+# This is not run unless one of the cwebdir/* files is changed.
+# Only try to run ./ctangle if it actually exists, otherwise
+# just touch ctangleboot.c and/or cwebboot.c and build ctangle.
+# We must serialize this.
 ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
 	  CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \
@@ -7926,119 +7961,119 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	  cp $(srcdir)/cwebboot.c .; \
 	fi
 bibtex.c bibtex.h: bibtex-web2c
-bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p
+bibtex-web2c: $(web2c_depend) web2c/cvtbib.sed bibtex.p
 	$(web2c) bibtex
 	echo timestamp >$@
 	touch bibtex.c bibtex.h
 bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch
 	$(tangle) bibtex bibtex
 dvicopy.c dvicopy.h: dvicopy-web2c
-dvicopy-web2c: $(web2c_common) $(web2c_programs) dvicopy.p
+dvicopy-web2c: $(web2c_depend) dvicopy.p
 	$(web2c) dvicopy
 	echo timestamp >$@
 	touch dvicopy.c dvicopy.h
 dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch
 	$(tangle) dvicopy dvicopy
 dvitomp.c dvitomp.h: dvitomp-web2c
-dvitomp-web2c: $(web2c_common) $(web2c_programs) dvitomp.p
+dvitomp-web2c: $(web2c_depend) dvitomp.p
 	$(web2c) dvitomp
 	echo timestamp >$@
 	touch dvitomp.c dvitomp.h
 dvitomp.p: tangle$(EXEEXT) dvitomp.web dvitomp.ch
 	$(tangle) dvitomp dvitomp
 dvitype.c dvitype.h: dvitype-web2c
-dvitype-web2c: $(web2c_common) $(web2c_programs) dvitype.p
+dvitype-web2c: $(web2c_depend) dvitype.p
 	$(web2c) dvitype
 	echo timestamp >$@
 	touch dvitype.c dvitype.h
 dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch
 	$(tangle) dvitype dvitype
 gftodvi.c gftodvi.h: gftodvi-web2c
-gftodvi-web2c: $(web2c_common) $(web2c_programs) gftodvi.p
+gftodvi-web2c: $(web2c_depend) gftodvi.p
 	$(web2c) gftodvi
 	echo timestamp >$@
 	touch gftodvi.c gftodvi.h
 gftodvi.p: tangle$(EXEEXT) gftodvi.web gftodvi.ch
 	$(tangle) gftodvi gftodvi
 gftopk.c gftopk.h: gftopk-web2c
-gftopk-web2c: $(web2c_common) $(web2c_programs) gftopk.p
+gftopk-web2c: $(web2c_depend) gftopk.p
 	$(web2c) gftopk
 	echo timestamp >$@
 	touch gftopk.c gftopk.h
 gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch
 	$(tangle) gftopk gftopk
 gftype.c gftype.h: gftype-web2c
-gftype-web2c: $(web2c_common) $(web2c_programs) gftype.p
+gftype-web2c: $(web2c_depend) gftype.p
 	$(web2c) gftype
 	echo timestamp >$@
 	touch gftype.c gftype.h
 gftype.p: tangle$(EXEEXT) gftype.web gftype.ch
 	$(tangle) gftype gftype
 mft.c mft.h: mft-web2c
-mft-web2c: $(web2c_common) $(web2c_programs) mft.p
+mft-web2c: $(web2c_depend) mft.p
 	$(web2c) mft
 	echo timestamp >$@
 	touch mft.c mft.h
 mft.p: tangle$(EXEEXT) mft.web mft.ch
 	$(tangle) mft mft
 patgen.c patgen.h: patgen-web2c
-patgen-web2c: $(web2c_common) $(web2c_programs) patgen.p
+patgen-web2c: $(web2c_depend) patgen.p
 	$(web2c) patgen
 	echo timestamp >$@
 	touch patgen.c patgen.h
 patgen.p: tangle$(EXEEXT) patgen.web patgen.ch
 	$(tangle) patgen patgen
 pktogf.c pktogf.h: pktogf-web2c
-pktogf-web2c: $(web2c_common) $(web2c_programs) pktogf.p
+pktogf-web2c: $(web2c_depend) pktogf.p
 	$(web2c) pktogf
 	echo timestamp >$@
 	touch pktogf.c pktogf.h
 pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch
 	$(tangle) pktogf pktogf
 pktype.c pktype.h: pktype-web2c
-pktype-web2c: $(web2c_common) $(web2c_programs) pktype.p
+pktype-web2c: $(web2c_depend) pktype.p
 	$(web2c) pktype
 	echo timestamp >$@
 	touch pktype.c pktype.h
 pktype.p: tangle$(EXEEXT) pktype.web pktype.ch
 	$(tangle) pktype pktype
 pltotf.c pltotf.h: pltotf-web2c
-pltotf-web2c: $(web2c_common) $(web2c_programs) pltotf.p
+pltotf-web2c: $(web2c_depend) pltotf.p
 	$(web2c) pltotf
 	echo timestamp >$@
 	touch pltotf.c pltotf.h
 pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch
 	$(tangle) pltotf pltotf
 pooltype.c pooltype.h: pooltype-web2c
-pooltype-web2c: $(web2c_common) $(web2c_programs) pooltype.p
+pooltype-web2c: $(web2c_depend) pooltype.p
 	$(web2c) pooltype
 	echo timestamp >$@
 	touch pooltype.c pooltype.h
 pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch
 	$(tangle) pooltype pooltype
 tftopl.c tftopl.h: tftopl-web2c
-tftopl-web2c: $(web2c_common) $(web2c_programs) tftopl.p
+tftopl-web2c: $(web2c_depend) tftopl.p
 	$(web2c) tftopl
 	echo timestamp >$@
 	touch tftopl.c tftopl.h
 tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch
 	$(tangle) tftopl tftopl
 vftovp.c vftovp.h: vftovp-web2c
-vftovp-web2c: $(web2c_common) $(web2c_programs) vftovp.p
+vftovp-web2c: $(web2c_depend) vftovp.p
 	$(web2c) vftovp
 	echo timestamp >$@
 	touch vftovp.c vftovp.h
 vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch
 	$(tangle) vftovp vftovp
 vptovf.c vptovf.h: vptovf-web2c
-vptovf-web2c: $(web2c_common) $(web2c_programs) vptovf.p
+vptovf-web2c: $(web2c_depend) vptovf.p
 	$(web2c) vptovf
 	echo timestamp >$@
 	touch vptovf.c vptovf.h
 vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch
 	$(tangle) vptovf vptovf
 weave.c weave.h: weave-web2c
-weave-web2c: $(web2c_common) $(web2c_programs) weave.p
+weave-web2c: $(web2c_depend) weave.p
 	$(web2c) weave
 	echo timestamp >$@
 	touch weave.c weave.h
@@ -8051,40 +8086,53 @@ cweave.c: ctangle$(EXEEXT) cwebdir/cweave.w cwebdir/cweav-w2c.ch
 tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
 	CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
 $(tex_c_h): tex-web2c
+
 tex-web2c: tex.p $(web2c_texmf)
 	$(web2c) tex
 	: $(synctex_convert_tex)
 	echo timestamp >$@
 	touch $(tex_c_h)
+
+tex-pool.c: tex.pool $(makecpool_stamp) tmf-pool.h
+	$(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 texextra.c: lib/texmfmp.c texd.h
 	sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/lib/texmfmp.c >$@
+
+# Tangling TeX
 tex.p tex.pool: tex-tangle
-tex-tangle: $(TANGLE) tex.web tex-final.ch
+tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch
 	$(tangle) tex.web tex-final.ch
 	echo timestamp >$@
 	touch tex.p tex.pool
-tex-pool.c: tex.pool $(makecpool) tmf-pool.h
-	$(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
-tex-final.ch: $(TIE) $(tex_ch_srcs)
+
+tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
 	$(tie) -c $@ $(tex_ch_srcs)
 $(windowlib): mfd.h $(srcdir)/window/*.c
 	cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a
+
 $(mf_c_h): mf-web2c
 mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
 	$(web2c) mf
 	echo timestamp >$@
 	touch $(mf_c_h)
+
+mf-pool.c: mf.pool $(makecpool_stamp) tmf-pool.h
+	$(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 mfextra.c: lib/texmfmp.c mfd.h
 	sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@
+
+# Tangling Metafont
 mf.p mf.pool: mf-tangle
-mf-tangle: $(TANGLE) mf.web mf-final.ch
+mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch
 	$(tangle) mf.web mf-final.ch
 	echo timestamp >$@
 	touch mf.p mf.pool
-mf-final.ch: $(TIE) mf.web mf.ch mf-binpool.ch
+
+# Generate mf-final.ch
+mf-final.ch: tie$(EXEEXT) mf.web mf.ch mf-binpool.ch
 	$(tie) -c $@ mf.web mf.ch mf-binpool.ch
-mf-pool.c: mf.pool $(makecpool) tmf-pool.h
-	$(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
 $(oldmpost_c_h): mp-web2c
 mp-web2c: mp.p $(web2c_texmf) mpdir/mp.defines web2c/cvtmf1.sed web2c/cvtmf2.sed
 	$(web2c) mp
@@ -8097,7 +8145,7 @@ mp-tangle: tangle$(EXEEXT) mp.web mp.ch
 	$(tangle) mp mp
 	echo timestamp >$@
 	touch mp.p mp.pool
-mp-pool.c: mp.pool $(makecpool) mpdir/mplib.h
+mp-pool.c: mp.pool $(makecpool_stamp) mpdir/mplib.h
 	$(makecpool) mp.pool $(srcdir)/mpdir/mplib.h >$@ || rm -f $@
 
 $(liboldmpost_a_OBJECTS): mpd.h
@@ -8146,7 +8194,7 @@ etex-web2c: etex.p $(web2c_texmf)
 	echo timestamp >$@
 	touch $(etex_c_h)
 
-etex-pool.c: etex.pool $(makecpool) tmf-pool.h
+etex-pool.c: etex.pool $(makecpool_stamp) tmf-pool.h
 	$(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
 
 etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h
@@ -8156,21 +8204,25 @@ etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
 	sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/etexdir/etexextra.in >$@
 
+# Tangling e-TeX
 etex.p etex.pool: etex-tangle
 etex-tangle: tangle$(EXEEXT) etex.web etex.ch
 	$(tangle) etex etex
 	echo timestamp >$@
 	touch etex.p etex.pool
 
+# Extract etex version
 etexdir/etex.version: etexdir/etex.ch
 	$(mkdir_p) etexdir
 	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
 	  | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
 
-etex.web: $(TIE) $(etex_web_srcs)
+# Generate etex.web
+etex.web: tie$(EXEEXT) $(etex_web_srcs)
 	$(tie) -m etex.web $(etex_web_srcs)
 
-etex.ch: $(TIE) etex.web $(etex_ch_srcs)
+# Generate etex.ch
+etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
 	$(tie) -c etex.ch etex.web $(etex_ch_srcs)
 $(pdftex_c_h): pdftex-web2c
 pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
@@ -8185,7 +8237,7 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch
 	$(pdf_tangle) pdftex pdftex
 	echo timestamp >$@
 	touch pdftex.p pdftex.pool
-pdftex-pool.c: pdftex.pool $(makecpool) pdftexdir/ptexlib.h pdftexd.h
+pdftex-pool.c: pdftex.pool $(makecpool_stamp) pdftexdir/ptexlib.h pdftexd.h
 	$(makecpool) pdftex.pool pdftexdir/ptexlib.h >$@ || rm -f $@
 pdftexdir/pdftex.version: pdftexdir/pdftex.web
 	$(mkdir_p) pdftexdir
@@ -8195,7 +8247,7 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd
 	sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
 	    -e s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/pdftexdir/pdftexextra.in >$@
-pdftex.ch: $(TIE) $(pdftex_ch_srcs)
+pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
 	$(tie) -c pdftex.ch $(pdftex_ch_srcs)
 
 $(libpdftex_a_OBJECTS): pdftexd.h
@@ -8213,7 +8265,7 @@ luatex-tangle: luatangle$(EXEEXT) $(luatex_sources)
 	$(luatex_tangle) --underlines luatex luatex
 	echo timestamp >$@
 	touch luatex.p luatex.pool
-luatex-pool.c: luatex.pool $(makecpool) luatexdir/ptexlib.h luatexd.h
+luatex-pool.c: luatex.pool $(makecpool_stamp) luatexdir/ptexlib.h luatexd.h
 	$(makecpool) luatex.pool luatexdir/ptexlib.h >$@ || rm -f $@
 luatexdir/luatex.version: luatexdir/luatex.web
 	$(mkdir_p) luatexdir
@@ -8223,7 +8275,7 @@ luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version
 	sed -e s/LUATEX-VERSION/`cat luatexdir/luatex.version`/ \
 	  $(srcdir)/luatexdir/luatexextra.in >$@
 luatangle.c luatangle.h: luatangle-web2c
-luatangle-web2c: $(web2c_common) $(web2c_programs) luatangle.p
+luatangle-web2c: $(web2c_depend) luatangle.p
 	$(web2c) luatangle
 	echo timestamp >$@
 	touch luatangle.c luatangle.h
@@ -8277,54 +8329,54 @@ xetexdir/xetex.version: xetexdir/xetex.ch
 	grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
 	  | sed "s/^.*'-//;s/'.*$$//" >$@
 
-xetex.web: $(TIE) $(xetex_web_srcs)
+xetex.web: tie$(EXEEXT) $(xetex_web_srcs)
 	$(tie) -m xetex.web $(xetex_web_srcs)
 
 $(libxetex_a_OBJECTS): xetexd.h
 odvicopy.c odvicopy.h: odvicopy-web2c
-odvicopy-web2c: $(web2c_common) $(web2c_programs) odvicopy.p
+odvicopy-web2c: $(web2c_depend) odvicopy.p
 	$(web2c) odvicopy
 	echo timestamp >$@
 	touch odvicopy.c odvicopy.h
 odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources)
 	$(ow_tangle) odvicopy odvicopy
 odvitype.c odvitype.h: odvitype-web2c
-odvitype-web2c: $(web2c_common) $(web2c_programs) odvitype.p
+odvitype-web2c: $(web2c_depend) odvitype.p
 	$(web2c) odvitype
 	echo timestamp >$@
 	touch odvitype.c odvitype.h
 odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
 	$(ow_tangle) odvitype odvitype
 ofm2opl.c ofm2opl.h: ofm2opl-web2c
-ofm2opl-web2c: $(web2c_common) $(web2c_programs) ofm2opl.p
+ofm2opl-web2c: $(web2c_depend) ofm2opl.p
 	$(web2c) ofm2opl
 	echo timestamp >$@
 	touch ofm2opl.c ofm2opl.h
 ofm2opl.p: tangle$(EXEEXT) $(ofm2opl_sources)
 	$(ow_tangle) ofm2opl ofm2opl
 opl2ofm.c opl2ofm.h: opl2ofm-web2c
-opl2ofm-web2c: $(web2c_common) $(web2c_programs) opl2ofm.p
+opl2ofm-web2c: $(web2c_depend) opl2ofm.p
 	$(web2c) opl2ofm
 	echo timestamp >$@
 	touch opl2ofm.c opl2ofm.h
 opl2ofm.p: tangle$(EXEEXT) $(opl2ofm_sources)
 	$(ow_tangle) opl2ofm opl2ofm
 otangle.c otangle.h: otangle-web2c
-otangle-web2c: $(web2c_common) $(web2c_programs) otangle.p
+otangle-web2c: $(web2c_depend) otangle.p
 	$(web2c) otangle
 	echo timestamp >$@
 	touch otangle.c otangle.h
 otangle.p: tangle$(EXEEXT) $(otangle_sources)
 	$(ow_tangle) otangle otangle
 ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
-ovf2ovp-web2c: $(web2c_common) $(web2c_programs) ovf2ovp.p
+ovf2ovp-web2c: $(web2c_depend) ovf2ovp.p
 	$(web2c) ovf2ovp
 	echo timestamp >$@
 	touch ovf2ovp.c ovf2ovp.h
 ovf2ovp.p: tangle$(EXEEXT) $(ovf2ovp_sources)
 	$(ow_tangle) ovf2ovp ovf2ovp
 ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
-ovp2ovf-web2c: $(web2c_common) $(web2c_programs) ovp2ovf.p
+ovp2ovf-web2c: $(web2c_depend) ovp2ovf.p
 	$(web2c) ovp2ovf
 	echo timestamp >$@
 	touch ovp2ovf.c ovp2ovf.h
@@ -8338,7 +8390,7 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
 	$(web2c) aleph
 	echo timestamp >$@
 	touch $(aleph_c_h)
-aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h
+aleph-pool.c: aleph.pool $(makecpool_stamp) alephdir/aleph-pool.h
 	$(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@
 alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h
 	sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@
@@ -8348,9 +8400,9 @@ aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch
 	$(otangle) aleph aleph
 	echo timestamp >$@
 	touch aleph.p aleph.pool
-aleph.web: $(TIE) $(aleph_web_srcs)
+aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
 	$(tie) -m aleph.web $(aleph_web_srcs)
-aleph.ch: $(TIE) aleph.web $(aleph_ch_srcs)
+aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
 	$(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
 
 synctex.c: texd.h synctexdir/synctex.c $(dist_tex_SOURCES)
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index 36d4d1b71b8..2b2908075ac 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -1,4 +1,7 @@
 ## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## Aleph
 ##
@@ -30,7 +33,7 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
 	$(web2c) aleph
 	echo timestamp >$@
 	touch $(aleph_c_h)
-aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h
+aleph-pool.c: aleph.pool $(makecpool_stamp) alephdir/aleph-pool.h
 	$(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@
 alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h
 	sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@
@@ -67,7 +70,7 @@ aleph_web_srcs = \
 	alephdir/eover.ch \
 	alephdir/eopage.ch \
 	alephdir/eochar.ch
-aleph.web: $(TIE) $(aleph_web_srcs)
+aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
 	$(tie) -m aleph.web $(aleph_web_srcs)
 
 ## Generate aleph.ch
@@ -84,7 +87,7 @@ aleph_ch_srcs = \
 	alephdir/comdir.ch \
 	alephdir/comsrcspec.ch \
 	alephdir/ceostuff.ch
-aleph.ch: $(TIE) aleph.web $(aleph_ch_srcs)
+aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
 	$(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
 
 ##
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index a4dd05ccc80..9e27314160d 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -1,7 +1,10 @@
 ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
-## Bootstrapping tangle requires making it with itself.  We use the opportunity
-## to create an up-to-date tangleboot.p as well.
+# Bootstrapping tangle requires making it with itself.  We use the opportunity
+# to create an up-to-date tangleboot.p as well.
 bin_PROGRAMS += tangle
 nodist_tangle_SOURCES = tangle.c tangle.h
 tangle.c tangle.h: tangle-web2c
@@ -9,11 +12,10 @@ tangle-web2c: tangle.p
 	$(web2c) tangle
 	echo timestamp >$@
 	touch tangle.c tangle.h
-## tangle.p is a special case, since it is needed to compile itself.  We
-## convert and compile the (distributed) tangleboot.p to make a tangle
-## which we use to make the other programs.  We depend on tangleboot, even
-## though we might not use it.
-EXTRA_DIST += tangle.web tangle.ch
+# tangle.p is a special case, since it is needed to compile itself.  We
+# convert and compile the (distributed) tangleboot.p to make a tangle
+# which we use to make the other programs.  We depend on tangleboot, even
+# though we might not use it.
 tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch
 	WEBINPUTS=.:$(srcdir) $(tangleboot) tangle tangle
 tangle.web:
@@ -26,19 +28,20 @@ tangle.web:
 	@echo "In any case, you can get it from" >&2
 	@echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2
 	false
+EXTRA_DIST += tangle.web tangle.ch
 DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c
 
 noinst_PROGRAMS += tangleboot
 nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h
-tangleboot.c tangleboot.h: stamp-tangle $(web2c_programs) $(web2c_common)
+tangleboot.c tangleboot.h: stamp-tangle $(web2c_depend)
 	$(web2c) tangleboot
-## tangleboot.p is in the distribution
-EXTRA_DIST += tangleboot.p
+# tangleboot.p is in the distribution
 stamp-tangle: tangleboot.p
 	date >stamp-tangle
-## This is not run unless tangle.web or tangle.ch is changed.
-## Only try to run ./tangle if it actually exists, otherwise
-## just touch tangleboot.p and build tangle.
+EXTRA_DIST += tangleboot.p
+# This is not run unless tangle.web or tangle.ch is changed.
+# Only try to run ./tangle if it actually exists, otherwise
+# just touch tangleboot.p and build tangle.
 tangleboot.p: tangle.web tangle.ch
 	if [ -r $(TANGLE) ] || [ -r $(TANGLE).exe ]; then \
 	  $(tangle) tangle tangle; \
@@ -52,31 +55,31 @@ tangleboot.p: tangle.web tangle.ch
 	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
 DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h
 
-## Bootstrapping ctangle requires making it with itself.  We use the opportunity
-## to create an up-to-date ctangleboot.c and cwebboot.c as well.
+# Bootstrapping ctangle requires making it with itself.  We use the opportunity
+# to create an up-to-date ctangleboot.c and cwebboot.c as well.
 bin_PROGRAMS += ctangle
 nodist_ctangle_SOURCES = ctangle.c cweb.c
-## ctangle.c is a special case, since it is needed to compile itself.
-## We depend on ctangleboot, even though we might not use it.
-EXTRA_DIST += cwebdir
-## We install man/cweb.man, not cwebdir/cweb.1
-## nodist_man_MANS += cwebdir/cweb.1
+# ctangle.c is a special case, since it is needed to compile itself.
+# We depend on ctangleboot, even though we might not use it.
 ctangle.c: ctangleboot$(EXEEXT) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) ctangle ctang-w2c
 cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c
+EXTRA_DIST += cwebdir
+## We install man/cweb.man, not cwebdir/cweb.1
+## nodist_man_MANS += cwebdir/cweb.1
 DISTCLEANFILES += ctangle.c cweb.c
 
 noinst_PROGRAMS += ctangleboot
 nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
-## ctangleboot.c and cwebboot.c are in the distribution
-EXTRA_DIST += ctangleboot.c cwebboot.c
+# ctangleboot.c and cwebboot.c are in the distribution
 stamp-ctangle: ctangleboot.c cwebboot.c
 	date >stamp-ctangle
-## This is not run unless one of the cwebdir/* files is changed.
-## Only try to run ./ctangle if it actually exists, otherwise
-## just touch ctangleboot.c and/or cwebboot.c and build ctangle.
-## We must serialize this.
+EXTRA_DIST += ctangleboot.c cwebboot.c
+# This is not run unless one of the cwebdir/* files is changed.
+# Only try to run ./ctangle if it actually exists, otherwise
+# just touch ctangleboot.c and/or cwebboot.c and build ctangle.
+# We must serialize this.
 ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
 	  CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \
diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am
index 9cb6692121d..9ae28c722e0 100644
--- a/Build/source/texk/web2c/am/cweb.am
+++ b/Build/source/texk/web2c/am/cweb.am
@@ -1,4 +1,7 @@
 ## texk/web2c/am/cweb.am: Makefile fragment for cweb programs (except ctangle).
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 bin_PROGRAMS += ctie
 nodist_ctie_SOURCES = ctie.c
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index bcecb570e5f..6fb3125c49d 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -1,4 +1,7 @@
 ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## Common for MF and TeX
 EXTRA_DIST += \
@@ -18,28 +21,35 @@ EXTRA_PROGRAMS += tex
 
 tex_CPPFLAGS =
 
-## With --enable-ipc, TeX may need to link with -lsocket.
+# With --enable-ipc, TeX may need to link with -lsocket.
 tex_LDADD = $(LDADD) $(ipc_socketlibs)
 
+# TeX C sources
 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
 $(tex_c_h): tex-web2c
+
 tex-web2c: tex.p $(web2c_texmf)
 	$(web2c) tex
 	: $(synctex_convert_tex)
 	echo timestamp >$@
 	touch $(tex_c_h)
+
+tex-pool.c: tex.pool $(makecpool_stamp) tmf-pool.h
+	$(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 texextra.c: lib/texmfmp.c texd.h
 	sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/lib/texmfmp.c >$@
+
+# Tangling TeX
 tex.p tex.pool: tex-tangle
-tex-tangle: $(TANGLE) tex.web tex-final.ch
+tex-tangle: tangle$(EXEEXT) tex.web tex-final.ch
 	$(tangle) tex.web tex-final.ch
 	echo timestamp >$@
 	touch tex.p tex.pool
-tex-pool.c: tex.pool $(makecpool) tmf-pool.h
-	$(makecpool) tex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 ## Generate tex-final.ch
-tex-final.ch: $(TIE) $(tex_ch_srcs)
+tex-final.ch: tie$(EXEEXT) $(tex_ch_srcs)
 	$(tie) -c $@ $(tex_ch_srcs)
 tex_ch_srcs = \
 	tex.web \
@@ -87,26 +97,37 @@ mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXT
 ## Automake, however, does not support CPPFLAGS for individual source files.
 ## To avoid compiling everything twice, the common objects are in a library.
 EXTRA_LIBRARIES += libmf.a
+
+# Metafont C sources
 mf_c_h = mfini.c mf0.c mf1.c mfcoerce.h mfd.h
 nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c
 libmf_a_CPPFLAGS = -DMETA_FONT
+
 $(mf_c_h): mf-web2c
 mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
 	$(web2c) mf
 	echo timestamp >$@
 	touch $(mf_c_h)
-EXTRA_DIST += mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c tmf-pool.h
+
+mf-pool.c: mf.pool $(makecpool_stamp) tmf-pool.h
+	$(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
 mfextra.c: lib/texmfmp.c mfd.h
 	sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@
+
+# Tangling Metafont
 mf.p mf.pool: mf-tangle
-mf-tangle: $(TANGLE) mf.web mf-final.ch
+mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch
 	$(tangle) mf.web mf-final.ch
 	echo timestamp >$@
 	touch mf.p mf.pool
-mf-final.ch: $(TIE) mf.web mf.ch mf-binpool.ch
+
+# Generate mf-final.ch
+mf-final.ch: tie$(EXEEXT) mf.web mf.ch mf-binpool.ch
 	$(tie) -c $@ mf.web mf.ch mf-binpool.ch
-mf-pool.c: mf.pool $(makecpool) tmf-pool.h
-	$(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+##
+EXTRA_DIST += mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c tmf-pool.h
+
 DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mfextra.c mf-final.ch mf-web2c \
 	mf.p mf.pool mf-tangle
 
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index 6e479078515..2664d04d4fc 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -1,4 +1,7 @@
 ## texk/web2c/am/web.am: Makefile fragment for normal web programs (except tangle).
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 web_programs = bibtex dvicopy dvitomp dvitype gftodvi gftopk gftype mft \
 	patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf weave
@@ -14,7 +17,7 @@ DISTCLEANFILES += $(web_programs:=.c) $(web_programs:=.h) \
 
 nodist_bibtex_SOURCES = bibtex.c bibtex.h
 bibtex.c bibtex.h: bibtex-web2c
-bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p
+bibtex-web2c: $(web2c_depend) web2c/cvtbib.sed bibtex.p
 	$(web2c) bibtex
 	echo timestamp >$@
 	touch bibtex.c bibtex.h
@@ -23,7 +26,7 @@ bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch
 
 nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h
 dvicopy.c dvicopy.h: dvicopy-web2c
-dvicopy-web2c: $(web2c_common) $(web2c_programs) dvicopy.p
+dvicopy-web2c: $(web2c_depend) dvicopy.p
 	$(web2c) dvicopy
 	echo timestamp >$@
 	touch dvicopy.c dvicopy.h
@@ -32,7 +35,7 @@ dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch
 
 nodist_dvitomp_SOURCES = dvitomp.c dvitomp.h
 dvitomp.c dvitomp.h: dvitomp-web2c
-dvitomp-web2c: $(web2c_common) $(web2c_programs) dvitomp.p
+dvitomp-web2c: $(web2c_depend) dvitomp.p
 	$(web2c) dvitomp
 	echo timestamp >$@
 	touch dvitomp.c dvitomp.h
@@ -41,7 +44,7 @@ dvitomp.p: tangle$(EXEEXT) dvitomp.web dvitomp.ch
 
 nodist_dvitype_SOURCES = dvitype.c dvitype.h
 dvitype.c dvitype.h: dvitype-web2c
-dvitype-web2c: $(web2c_common) $(web2c_programs) dvitype.p
+dvitype-web2c: $(web2c_depend) dvitype.p
 	$(web2c) dvitype
 	echo timestamp >$@
 	touch dvitype.c dvitype.h
@@ -50,7 +53,7 @@ dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch
 
 nodist_gftodvi_SOURCES = gftodvi.c gftodvi.h
 gftodvi.c gftodvi.h: gftodvi-web2c
-gftodvi-web2c: $(web2c_common) $(web2c_programs) gftodvi.p
+gftodvi-web2c: $(web2c_depend) gftodvi.p
 	$(web2c) gftodvi
 	echo timestamp >$@
 	touch gftodvi.c gftodvi.h
@@ -60,7 +63,7 @@ gftodvi_SOURCES = gftodmem.h
 
 nodist_gftopk_SOURCES = gftopk.c gftopk.h
 gftopk.c gftopk.h: gftopk-web2c
-gftopk-web2c: $(web2c_common) $(web2c_programs) gftopk.p
+gftopk-web2c: $(web2c_depend) gftopk.p
 	$(web2c) gftopk
 	echo timestamp >$@
 	touch gftopk.c gftopk.h
@@ -69,7 +72,7 @@ gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch
 
 nodist_gftype_SOURCES = gftype.c gftype.h
 gftype.c gftype.h: gftype-web2c
-gftype-web2c: $(web2c_common) $(web2c_programs) gftype.p
+gftype-web2c: $(web2c_depend) gftype.p
 	$(web2c) gftype
 	echo timestamp >$@
 	touch gftype.c gftype.h
@@ -78,7 +81,7 @@ gftype.p: tangle$(EXEEXT) gftype.web gftype.ch
 
 nodist_mft_SOURCES = mft.c mft.h
 mft.c mft.h: mft-web2c
-mft-web2c: $(web2c_common) $(web2c_programs) mft.p
+mft-web2c: $(web2c_depend) mft.p
 	$(web2c) mft
 	echo timestamp >$@
 	touch mft.c mft.h
@@ -87,7 +90,7 @@ mft.p: tangle$(EXEEXT) mft.web mft.ch
 
 nodist_patgen_SOURCES = patgen.c patgen.h
 patgen.c patgen.h: patgen-web2c
-patgen-web2c: $(web2c_common) $(web2c_programs) patgen.p
+patgen-web2c: $(web2c_depend) patgen.p
 	$(web2c) patgen
 	echo timestamp >$@
 	touch patgen.c patgen.h
@@ -96,7 +99,7 @@ patgen.p: tangle$(EXEEXT) patgen.web patgen.ch
 
 nodist_pktogf_SOURCES = pktogf.c pktogf.h
 pktogf.c pktogf.h: pktogf-web2c
-pktogf-web2c: $(web2c_common) $(web2c_programs) pktogf.p
+pktogf-web2c: $(web2c_depend) pktogf.p
 	$(web2c) pktogf
 	echo timestamp >$@
 	touch pktogf.c pktogf.h
@@ -105,7 +108,7 @@ pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch
 
 nodist_pktype_SOURCES = pktype.c pktype.h
 pktype.c pktype.h: pktype-web2c
-pktype-web2c: $(web2c_common) $(web2c_programs) pktype.p
+pktype-web2c: $(web2c_depend) pktype.p
 	$(web2c) pktype
 	echo timestamp >$@
 	touch pktype.c pktype.h
@@ -114,7 +117,7 @@ pktype.p: tangle$(EXEEXT) pktype.web pktype.ch
 
 nodist_pltotf_SOURCES = pltotf.c pltotf.h
 pltotf.c pltotf.h: pltotf-web2c
-pltotf-web2c: $(web2c_common) $(web2c_programs) pltotf.p
+pltotf-web2c: $(web2c_depend) pltotf.p
 	$(web2c) pltotf
 	echo timestamp >$@
 	touch pltotf.c pltotf.h
@@ -123,7 +126,7 @@ pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch
 
 nodist_pooltype_SOURCES = pooltype.c pooltype.h
 pooltype.c pooltype.h: pooltype-web2c
-pooltype-web2c: $(web2c_common) $(web2c_programs) pooltype.p
+pooltype-web2c: $(web2c_depend) pooltype.p
 	$(web2c) pooltype
 	echo timestamp >$@
 	touch pooltype.c pooltype.h
@@ -132,7 +135,7 @@ pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch
 
 nodist_tftopl_SOURCES = tftopl.c tftopl.h
 tftopl.c tftopl.h: tftopl-web2c
-tftopl-web2c: $(web2c_common) $(web2c_programs) tftopl.p
+tftopl-web2c: $(web2c_depend) tftopl.p
 	$(web2c) tftopl
 	echo timestamp >$@
 	touch tftopl.c tftopl.h
@@ -141,7 +144,7 @@ tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch
 
 nodist_vftovp_SOURCES = vftovp.c vftovp.h
 vftovp.c vftovp.h: vftovp-web2c
-vftovp-web2c: $(web2c_common) $(web2c_programs) vftovp.p
+vftovp-web2c: $(web2c_depend) vftovp.p
 	$(web2c) vftovp
 	echo timestamp >$@
 	touch vftovp.c vftovp.h
@@ -150,7 +153,7 @@ vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch
 
 nodist_vptovf_SOURCES = vptovf.c vptovf.h
 vptovf.c vptovf.h: vptovf-web2c
-vptovf-web2c: $(web2c_common) $(web2c_programs) vptovf.p
+vptovf-web2c: $(web2c_depend) vptovf.p
 	$(web2c) vptovf
 	echo timestamp >$@
 	touch vptovf.c vptovf.h
@@ -159,7 +162,7 @@ vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch
 
 nodist_weave_SOURCES = weave.c weave.h
 weave.c weave.h: weave-web2c
-weave-web2c: $(web2c_common) $(web2c_programs) weave.p
+weave-web2c: $(web2c_depend) weave.p
 	$(web2c) weave
 	echo timestamp >$@
 	touch weave.c weave.h
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index f0be8c5f5b3..0f8d5db0a57 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18000,7 +18000,7 @@ fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wsock32_main" >&5
 $as_echo "$ac_cv_lib_wsock32_main" >&6; }
 if test "x$ac_cv_lib_wsock32_main" = x""yes; then
-  ac_cv_search_connect=wsock32
+  ac_cv_search_connect=-lwsock32
 else
   ac_cv_search_connect=no
 fi
@@ -18023,20 +18023,122 @@ $as_echo "$as_me: WARNING: no socket library: disabling ipc" >&2;}
                              enable_ipc=no
 fi
  ;;
-  *) socketlibs="-l$ac_cv_search_connect" ;;
+  *) socketlibs=$ac_cv_search_connect ;;
 esac
 
 fi
 
 if test "x$enable_ipc" = xyes; then
-  ipc_socketlibs=$socketlibs
+   ipc_socketlibs=$socketlibs
 
 cat >>confdefs.h <<\_ACEOF
 #define IPC 1
 _ACEOF
 
 fi
+# On Solaris we may need -lrt for nanosleep in luaTeX.
+if test "x$kpse_cv_have_win32" = xno; then
+  kpse_save_LIBS=$LIBS
+  { $as_echo "$as_me:$LINENO: checking for library containing nanosleep" >&5
+$as_echo_n "checking for library containing nanosleep... " >&6; }
+if test "${ac_cv_search_nanosleep+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nanosleep ();
+int
+main ()
+{
+return nanosleep ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' rt; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_nanosleep=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_nanosleep+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_nanosleep+set}" = set; then
+  :
+else
+  ac_cv_search_nanosleep=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_nanosleep" >&5
+$as_echo "$ac_cv_search_nanosleep" >&6; }
+ac_res=$ac_cv_search_nanosleep
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+  LIBS=$kpse_save_LIBS
+  case $ac_cv_search_nanosleep in
+  "none required") : ;;
+  no) if test "x$enable_luatex" = xyes; then
+  { $as_echo "$as_me:$LINENO: WARNING: Sorry, no nanosleep: can not build luaTeX" >&5
+$as_echo "$as_me: WARNING: Sorry, no nanosleep: can not build luaTeX" >&2;}
+                        enable_luatex=no
+fi
+ ;;
+  *) socketlibs="$socketlibs ac_cv_search_nanosleep" ;;
+esac
+
+fi
 
 
 
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index b21340b117b..56e0fa4c8b2 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -75,10 +75,23 @@ AS_IF([test "x$enable_luatex:$enable_ipc" != xno:no],
                       AS_IF([test "x$enable_ipc" = xyes],
                             [AC_MSG_WARN([no socket library: disabling ipc])
                              enable_ipc=no])],
-               [socketlibs="-l$ac_cv_search_connect"])])
-AS_IF([test "x$enable_ipc" = xyes],
-      [ipc_socketlibs=$socketlibs
-       AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])])
+               [socketlibs=$ac_cv_search_connect])])
+if test "x$enable_ipc" = xyes; then
+   ipc_socketlibs=$socketlibs
+   AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])
+fi
+# On Solaris we may need -lrt for nanosleep in luaTeX.
+if test "x$kpse_cv_have_win32" = xno; then
+  kpse_save_LIBS=$LIBS
+  AC_SEARCH_LIBS([nanosleep], [rt])
+  LIBS=$kpse_save_LIBS
+  AS_CASE([$ac_cv_search_nanosleep],
+          ["none required"], [],
+          [no], [AS_IF([test "x$enable_luatex" = xyes],
+                       [AC_MSG_WARN([Sorry, no nanosleep: can not build luaTeX])
+                        enable_luatex=no])],
+          [socketlibs="$socketlibs ac_cv_search_nanosleep"])
+fi
 AC_SUBST([socketlibs])
 AC_SUBST([ipc_socketlibs])
 
diff --git a/Build/source/texk/web2c/doc/Makefile.am b/Build/source/texk/web2c/doc/Makefile.am
index 7870e922dd5..949ad7c2aa6 100644
--- a/Build/source/texk/web2c/doc/Makefile.am
+++ b/Build/source/texk/web2c/doc/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/doc/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 info_TEXINFOS = web2c.texi
 web2c_TEXINFOS = install.texi ref.txi
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index d6a6d066686..257a7ac154c 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -1,4 +1,7 @@
 ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## e-TeX
 ##
@@ -9,10 +12,10 @@ EXTRA_PROGRAMS += etex
 
 etex_CPPFLAGS =
 
-## With --enable-ipc, e-TeX may need to link with -lsocket.
+# With --enable-ipc, e-TeX may need to link with -lsocket.
 etex_LDADD = $(LDADD) $(ipc_socketlibs)
 
-## e-TeX C sources
+# e-TeX C sources
 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
 
@@ -23,7 +26,7 @@ etex-web2c: etex.p $(web2c_texmf)
 	echo timestamp >$@
 	touch $(etex_c_h)
 
-etex-pool.c: etex.pool $(makecpool) tmf-pool.h
+etex-pool.c: etex.pool $(makecpool_stamp) tmf-pool.h
 	$(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
 
 etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h
@@ -33,31 +36,30 @@ etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
 	sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/etexdir/etexextra.in >$@
 
-## Tangling e-TeX
+# Tangling e-TeX
 etex.p etex.pool: etex-tangle
 etex-tangle: tangle$(EXEEXT) etex.web etex.ch
 	$(tangle) etex etex
 	echo timestamp >$@
 	touch etex.p etex.pool
 
-## Extract etex version
+# Extract etex version
 etexdir/etex.version: etexdir/etex.ch
 	$(mkdir_p) etexdir
 	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
 	  | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
 
-## Generate etex.web
-etex.web: $(TIE) $(etex_web_srcs)
+# Generate etex.web
+etex.web: tie$(EXEEXT) $(etex_web_srcs)
 	$(tie) -m etex.web $(etex_web_srcs)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
 	etexdir/etex.fix
 
-## Generate etex.ch
-etex.ch: $(TIE) etex.web $(etex_ch_srcs)
+# Generate etex.ch
+etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
 	$(tie) -c etex.ch etex.web $(etex_ch_srcs)
-
 etex_ch_srcs = \
 	etexdir/tex.ch0 \
 	tex.ch \
@@ -65,7 +67,6 @@ etex_ch_srcs = \
 	etexdir/tex.ch1 \
 	etexdir/tex.ech \
 	etexdir/etex-binpool.ch
-
 ##
 EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \
 	lib/texmfmp.c tmf-pool.h
diff --git a/Build/source/texk/web2c/lib/Makefile.am b/Build/source/texk/web2c/lib/Makefile.am
index d3e30c44a12..8316f1cccc3 100644
--- a/Build/source/texk/web2c/lib/Makefile.am
+++ b/Build/source/texk/web2c/lib/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/lib/
+##
+## Copyright (C) 2009 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)
 
diff --git a/Build/source/texk/web2c/libmd5/am/md5.am b/Build/source/texk/web2c/libmd5/am/md5.am
index 86881e385cf..701706dde6e 100644
--- a/Build/source/texk/web2c/libmd5/am/md5.am
+++ b/Build/source/texk/web2c/libmd5/am/md5.am
@@ -1,4 +1,7 @@
 ## texk/web2c/libmd5/am/md5.am: Makefile fragment for md5.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## libmd5
 ##
diff --git a/Build/source/texk/web2c/luatexdir/am/liblua51.am b/Build/source/texk/web2c/luatexdir/am/liblua51.am
index 3af4f056f97..135f2a802f8 100644
--- a/Build/source/texk/web2c/luatexdir/am/liblua51.am
+++ b/Build/source/texk/web2c/luatexdir/am/liblua51.am
@@ -1,4 +1,7 @@
 ## texk/web2c/luatexdir/am/liblua51.am: Makefile fragment for liblua51.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## liblua51
 ##
diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am
index 515d51ae707..88c03eb7589 100644
--- a/Build/source/texk/web2c/luatexdir/am/libluatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am
@@ -1,4 +1,7 @@
 ## texk/web2c/luatexdir/am/libluatex.am: Makefile fragment for libluatex.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## libluatex
 ##
diff --git a/Build/source/texk/web2c/luatexdir/am/libzzip.am b/Build/source/texk/web2c/luatexdir/am/libzzip.am
index 89389901e79..d287f2ccc54 100644
--- a/Build/source/texk/web2c/luatexdir/am/libzzip.am
+++ b/Build/source/texk/web2c/luatexdir/am/libzzip.am
@@ -1,4 +1,7 @@
 ## texk/web2c/luatexdir/am/libzzip.am: Makefile fragment for libzzip.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## zziplib
 ##
diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
index de2872824d3..8669cfd3571 100644
--- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am
+++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
@@ -1,4 +1,7 @@
 ## texk/web2c/luatexdir/am/luafontforge.am: Makefile fragment for libff.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## luafontforge
 ##
diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am
index cb1cee694e3..bc8e46ebd86 100644
--- a/Build/source/texk/web2c/luatexdir/am/luamisc.am
+++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am
@@ -1,5 +1,8 @@
 ## texk/web2c/luatexdir/am/luamisc.am: Makefile fragment for libluamisc
 ## (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, and slnunicode)
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler,
 ## and slnunicode)
diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am
index a58704c0476..1a05d72216d 100644
--- a/Build/source/texk/web2c/luatexdir/am/luasocket.am
+++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am
@@ -1,4 +1,7 @@
 ## texk/web2c/luatexdir/am/luasocket.am: Makefile fragment for libluasocket.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## luasocket
 ##
diff --git a/Build/source/texk/web2c/luatexdir/am/luatangle.am b/Build/source/texk/web2c/luatexdir/am/luatangle.am
index 2e4e7451699..63e8d9b3f31 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatangle.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatangle.am
@@ -1,4 +1,7 @@
 ## texk/web2c/luatexdir/am/luatangle.am: Makefile fragment for luatangle.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## luatangle
 ##
@@ -9,7 +12,7 @@ EXTRA_PROGRAMS += luatangle
 
 nodist_luatangle_SOURCES = luatangle.c luatangle.h
 luatangle.c luatangle.h: luatangle-web2c
-luatangle-web2c: $(web2c_common) $(web2c_programs) luatangle.p
+luatangle-web2c: $(web2c_depend) luatangle.p
 	$(web2c) luatangle
 	echo timestamp >$@
 	touch luatangle.c luatangle.h
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index bdfa8ebca40..e3f179f5c96 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -1,4 +1,7 @@
 ## texk/web2c/luatexdir/am/luatex.am: Makefile fragment for luaTeX.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## luaTeX
 ##
@@ -44,7 +47,7 @@ luatex-tangle: luatangle$(EXEEXT) $(luatex_sources)
 	$(luatex_tangle) --underlines luatex luatex
 	echo timestamp >$@
 	touch luatex.p luatex.pool
-luatex-pool.c: luatex.pool $(makecpool) luatexdir/ptexlib.h luatexd.h
+luatex-pool.c: luatex.pool $(makecpool_stamp) luatexdir/ptexlib.h luatexd.h
 	$(makecpool) luatex.pool luatexdir/ptexlib.h >$@ || rm -f $@
 ## Extract luatex version
 luatexdir/luatex.version: luatexdir/luatex.web
diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am
index 129f41b6c55..73e036b0966 100644
--- a/Build/source/texk/web2c/man/Makefile.am
+++ b/Build/source/texk/web2c/man/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/man/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 man_sources = $(bootstrap_man_sources)
 EXTRA_DIST = $(bootstrap_man_sources)
diff --git a/Build/source/texk/web2c/mpdir/am/mp.am b/Build/source/texk/web2c/mpdir/am/mp.am
index 6ebb12ea563..9b597823923 100644
--- a/Build/source/texk/web2c/mpdir/am/mp.am
+++ b/Build/source/texk/web2c/mpdir/am/mp.am
@@ -1,4 +1,7 @@
 ## texk/web2c/mpdir/am/mp.am: Makefile fragment for MetaPost.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## MetaPost
 ##
@@ -24,7 +27,7 @@ mp-tangle: tangle$(EXEEXT) mp.web mp.ch
 	$(tangle) mp mp
 	echo timestamp >$@
 	touch mp.p mp.pool
-mp-pool.c: mp.pool $(makecpool) mpdir/mplib.h
+mp-pool.c: mp.pool $(makecpool_stamp) mpdir/mplib.h
 	$(makecpool) mp.pool $(srcdir)/mpdir/mplib.h >$@ || rm -f $@
 DISTCLEANFILES += $(nodist_oldmpost_SOURCES) mp-web2c \
 	mp.p mp.pool mp-tangle
diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am
index 491054dadfe..bd8038d3de0 100644
--- a/Build/source/texk/web2c/mplibdir/am/libmplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am
@@ -1,4 +1,7 @@
 ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## libmplib.a, used by MetaPost and luaTeX
 ##
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index a4aad4b0290..fe9c89bfd72 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -1,4 +1,7 @@
 ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## MetaPost
 ##
diff --git a/Build/source/texk/web2c/mpware/Makefile.am b/Build/source/texk/web2c/mpware/Makefile.am
index 6242822210e..80f8c338b47 100644
--- a/Build/source/texk/web2c/mpware/Makefile.am
+++ b/Build/source/texk/web2c/mpware/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/mpware/
+##
+## Copyright (C) 2009 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)
 
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am
index 52c893763d0..7f7c549aac0 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.am
+++ b/Build/source/texk/web2c/omegafonts/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/omegafonts/
+##
+## Copyright (C) 2009 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)
 AM_YFLAGS = -d -v
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index e54c8096fd0..5d660aa2b34 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -1,4 +1,7 @@
 ## texk/web2c/omegaware/am/omegaware.am: Makefile fragment for omegaware web programs.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 omegaware_tools = odvicopy odvitype otangle
 omegaware_font_tools = ofm2opl opl2ofm ovf2ovp ovp2ovf
@@ -20,7 +23,7 @@ ow_tangle = WEBINPUTS=$(srcdir)/omegaware $(buildenv) $(TANGLE)
 
 nodist_odvicopy_SOURCES = odvicopy.c odvicopy.h
 odvicopy.c odvicopy.h: odvicopy-web2c
-odvicopy-web2c: $(web2c_common) $(web2c_programs) odvicopy.p
+odvicopy-web2c: $(web2c_depend) odvicopy.p
 	$(web2c) odvicopy
 	echo timestamp >$@
 	touch odvicopy.c odvicopy.h
@@ -31,7 +34,7 @@ odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources)
 
 nodist_odvitype_SOURCES = odvitype.c odvitype.h
 odvitype.c odvitype.h: odvitype-web2c
-odvitype-web2c: $(web2c_common) $(web2c_programs) odvitype.p
+odvitype-web2c: $(web2c_depend) odvitype.p
 	$(web2c) odvitype
 	echo timestamp >$@
 	touch odvitype.c odvitype.h
@@ -42,7 +45,7 @@ odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
 
 nodist_ofm2opl_SOURCES = ofm2opl.c ofm2opl.h
 ofm2opl.c ofm2opl.h: ofm2opl-web2c
-ofm2opl-web2c: $(web2c_common) $(web2c_programs) ofm2opl.p
+ofm2opl-web2c: $(web2c_depend) ofm2opl.p
 	$(web2c) ofm2opl
 	echo timestamp >$@
 	touch ofm2opl.c ofm2opl.h
@@ -53,7 +56,7 @@ ofm2opl.p: tangle$(EXEEXT) $(ofm2opl_sources)
 
 nodist_opl2ofm_SOURCES = opl2ofm.c opl2ofm.h
 opl2ofm.c opl2ofm.h: opl2ofm-web2c
-opl2ofm-web2c: $(web2c_common) $(web2c_programs) opl2ofm.p
+opl2ofm-web2c: $(web2c_depend) opl2ofm.p
 	$(web2c) opl2ofm
 	echo timestamp >$@
 	touch opl2ofm.c opl2ofm.h
@@ -64,7 +67,7 @@ opl2ofm.p: tangle$(EXEEXT) $(opl2ofm_sources)
 
 nodist_otangle_SOURCES = otangle.c otangle.h
 otangle.c otangle.h: otangle-web2c
-otangle-web2c: $(web2c_common) $(web2c_programs) otangle.p
+otangle-web2c: $(web2c_depend) otangle.p
 	$(web2c) otangle
 	echo timestamp >$@
 	touch otangle.c otangle.h
@@ -75,7 +78,7 @@ otangle.p: tangle$(EXEEXT) $(otangle_sources)
 
 nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
 ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
-ovf2ovp-web2c: $(web2c_common) $(web2c_programs) ovf2ovp.p
+ovf2ovp-web2c: $(web2c_depend) ovf2ovp.p
 	$(web2c) ovf2ovp
 	echo timestamp >$@
 	touch ovf2ovp.c ovf2ovp.h
@@ -86,7 +89,7 @@ ovf2ovp.p: tangle$(EXEEXT) $(ovf2ovp_sources)
 
 nodist_ovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
 ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
-ovp2ovf-web2c: $(web2c_common) $(web2c_programs) ovp2ovf.p
+ovp2ovf-web2c: $(web2c_depend) ovp2ovf.p
 	$(web2c) ovp2ovf
 	echo timestamp >$@
 	touch ovp2ovf.c ovp2ovf.h
@@ -96,7 +99,7 @@ ovp2ovf.p: tangle$(EXEEXT) $(ovp2ovf_sources)
 	$(ow_tangle) ovp2ovf ovp2ovf
 
 ## Tests
-
+##
 dist_check_SCRIPTS += omegaware/otangle.test
 
 if OTANGLE
diff --git a/Build/source/texk/web2c/otps/Makefile.am b/Build/source/texk/web2c/otps/Makefile.am
index 5cb507d9e05..31ff842c178 100644
--- a/Build/source/texk/web2c/otps/Makefile.am
+++ b/Build/source/texk/web2c/otps/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/otps/
+##
+## Copyright (C) 2009 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)
 AM_YFLAGS = -d -v
diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
index 7b464242f0e..0e3c5b90f19 100644
--- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -1,4 +1,7 @@
 ## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## libpdftex
 ##
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 808103ed721..8903a3abbb2 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -1,4 +1,7 @@
 ## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
 pdftex_cppflags += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
@@ -45,7 +48,7 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch
 	$(pdf_tangle) pdftex pdftex
 	echo timestamp >$@
 	touch pdftex.p pdftex.pool
-pdftex-pool.c: pdftex.pool $(makecpool) pdftexdir/ptexlib.h pdftexd.h
+pdftex-pool.c: pdftex.pool $(makecpool_stamp) pdftexdir/ptexlib.h pdftexd.h
 	$(makecpool) pdftex.pool pdftexdir/ptexlib.h >$@ || rm -f $@
 ## Extract pdftex version
 pdftexdir/pdftex.version: pdftexdir/pdftex.web
@@ -57,7 +60,7 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd
 	    -e s/ETEX-VERSION/`cat etexdir/etex.version`/ \
 	  $(srcdir)/pdftexdir/pdftexextra.in >$@
 ## Generate pdftex.ch
-pdftex.ch: $(TIE) $(pdftex_ch_srcs)
+pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
 	$(tie) -c pdftex.ch $(pdftex_ch_srcs)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
index 039589db40f..bc6c5d7d45b 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
@@ -1,4 +1,7 @@
 ## texk/web2c/pdftexdir/am/pdftosrc.am: Makefile fragment for pdftosrc.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## pdftosrc
 ##
diff --git a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
index 0382bd5ae63..42c0f82ce98 100644
--- a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
+++ b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
@@ -1,4 +1,7 @@
 ## texk/web2c/pdftexdir/am/ttf2afm.am: Makefile fragment for ttf2afm.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## ttf2afm
 ##
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index 578a49ace02..3fc507b4567 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -1,4 +1,7 @@
 ## texk/web2c/synctexdir/am/synctex.am: Makefile fragment for SyncTeX.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## The SyncTeX tool
 
diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am
index 6875a761a37..5c3974dd8a3 100644
--- a/Build/source/texk/web2c/web2c/Makefile.am
+++ b/Build/source/texk/web2c/web2c/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../../m4
 
@@ -43,6 +47,22 @@ splitup_SOURCES = \
 makecpool_SOURCES = \
 	makecpool.c
 
+nodist_noinst_DATA = stamp-web2c stamp-fixwrites stamp-splitup stamp-makecpool
+
+stamp-web2c: web2c$(EXEEXT)
+	echo timestamp >$@
+
+stamp-fixwrites: fixwrites$(EXEEXT)
+	echo timestamp >$@
+
+stamp-splitup: splitup$(EXEEXT)
+	echo timestamp >$@
+
+stamp-makecpool: makecpool$(EXEEXT)
+	echo timestamp >$@
+
+CLEANFILES = $(nodist_noinst_DATA)
+
 ## Obsolete ??
 ##
 EXTRA_DIST = convert.bat
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 8b58aa9f5ce..79128661144 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -110,7 +110,7 @@ SOURCES = $(fixwrites_SOURCES) $(makecpool_SOURCES) $(splitup_SOURCES) \
 	$(web2c_SOURCES)
 DIST_SOURCES = $(fixwrites_SOURCES) $(makecpool_SOURCES) \
 	$(splitup_SOURCES) $(web2c_SOURCES)
-DATA = $(dist_noinst_DATA)
+DATA = $(dist_noinst_DATA) $(nodist_noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -274,6 +274,8 @@ splitup_SOURCES = \
 makecpool_SOURCES = \
 	makecpool.c
 
+nodist_noinst_DATA = stamp-web2c stamp-fixwrites stamp-splitup stamp-makecpool
+CLEANFILES = $(nodist_noinst_DATA)
 EXTRA_DIST = convert.bat
 all: all-am
 
@@ -603,6 +605,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -697,6 +700,18 @@ uninstall-am:
 
 native/config.h: ../config.h
 	sed -e 's,web2c/c-auto,kpathsea/c-auto,' $(srcdir)/../config.h >$@
+
+stamp-web2c: web2c$(EXEEXT)
+	echo timestamp >$@
+
+stamp-fixwrites: fixwrites$(EXEEXT)
+	echo timestamp >$@
+
+stamp-splitup: splitup$(EXEEXT)
+	echo timestamp >$@
+
+stamp-makecpool: makecpool$(EXEEXT)
+	echo timestamp >$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/texk/web2c/window/Makefile.am b/Build/source/texk/web2c/window/Makefile.am
index a49d095c89a..05aefbdd788 100644
--- a/Build/source/texk/web2c/window/Makefile.am
+++ b/Build/source/texk/web2c/window/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/web2c/doc/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 INCLUDES = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
 
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 9c4cb58a0f2..9cc78121d1a 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,4 +1,7 @@
 ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 
 ## XeTeX
 ##
@@ -97,7 +100,7 @@ xetexdir/xetex.version: xetexdir/xetex.ch
 	  | sed "s/^.*'-//;s/'.*$$//" >$@
 
 ## Generate xetex.web
-xetex.web: $(TIE) $(xetex_web_srcs)
+xetex.web: tie$(EXEEXT) $(xetex_web_srcs)
 	$(tie) -m xetex.web $(xetex_web_srcs)
 
 xetex_web_srcs = \
diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am
index b2e7db23cc9..d8be12f2cd1 100644
--- a/Build/source/texk/xdvik/Makefile.am
+++ b/Build/source/texk/xdvik/Makefile.am
@@ -170,11 +170,13 @@ xdvi_bin_DEPENDENCIES = libxdvi.a $(common_dependencies)
 
 LDADD = libxdvi.a $(common_ldadd)
 
-psheader.c: psheader.txt squeeze/squeeze$(EXEEXT)
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary file squeeze/stamp-squeeze.
+psheader.c: psheader.txt squeeze/stamp-squeeze
 	squeeze/squeeze $(srcdir)/psheader.txt $@
 
-squeeze/squeeze$(EXEEXT):
-	cd squeeze && $(MAKE) $(AM_MAKEFLAGS)
+squeeze/stamp-squeeze:
+	cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
 
 EXTRA_DIST = psheader.txt
 CLEANFILES = psheader.c
diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in
index 2eb425a84f2..8372b4cccbe 100644
--- a/Build/source/texk/xdvik/Makefile.in
+++ b/Build/source/texk/xdvik/Makefile.in
@@ -1533,11 +1533,13 @@ uninstall-man: uninstall-man1
 @KPATHSEA_RULE@
 @T1LIB_RULE@
 
-psheader.c: psheader.txt squeeze/squeeze$(EXEEXT)
+# When cross-compiling, EXEEXT for the build and hosts system may differ.
+# Thus we depend on the auxiliary file squeeze/stamp-squeeze.
+psheader.c: psheader.txt squeeze/stamp-squeeze
 	squeeze/squeeze $(srcdir)/psheader.txt $@
 
-squeeze/squeeze$(EXEEXT):
-	cd squeeze && $(MAKE) $(AM_MAKEFLAGS)
+squeeze/stamp-squeeze:
+	cd squeeze && $(MAKE) $(AM_MAKEFLAGS) stamp-squeeze
 
 xdvi.1: xdvi.1.in sedscript
 	sed -f sedscript <$(srcdir)/xdvi.1.in >$@
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index d256afdbfca..887eef3be39 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -19373,7 +19373,7 @@ fi
 
 case $ac_cv_search_iconv in
   no | "none required") : ;;
-  *) iconv_libs="-l$ac_cv_search_iconv" ;;
+  *) iconv_libs=$ac_cv_search_iconv ;;
 esac
 
 
diff --git a/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4
index 7ffd12bb3d3..bbe12f3cba0 100644
--- a/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4
@@ -32,7 +32,7 @@ LDFLAGS="$iconv_libpath $LDFLAGS"
 AC_SEARCH_LIBS([iconv], [iconv recode])
 AS_CASE([$ac_cv_search_iconv],
         [no | "none required"], [:],
-        [iconv_libs="-l$ac_cv_search_iconv"])
+        [iconv_libs=$ac_cv_search_iconv])
 AC_CHECK_FUNCS([iconv])
 AC_CHECK_HEADERS([iconv.h])
 if test "x$ac_cv_func_iconv:$ac_cv_header_iconv_h" = xyes:yes; then
diff --git a/Build/source/texk/xdvik/squeeze/Makefile.am b/Build/source/texk/xdvik/squeeze/Makefile.am
index 7c96e17ddbf..d5b2561d3c4 100644
--- a/Build/source/texk/xdvik/squeeze/Makefile.am
+++ b/Build/source/texk/xdvik/squeeze/Makefile.am
@@ -7,3 +7,10 @@ ACLOCAL_AMFLAGS = -I ../../../m4
 
 noinst_PROGRAMS = squeeze
 
+nodist_noinst_DATA = stamp-squeeze
+
+stamp-squeeze: squeeze$(EXEEXT)
+	echo timestamp >$@
+
+CLEANFILES = stamp-squeeze
+
diff --git a/Build/source/texk/xdvik/squeeze/Makefile.in b/Build/source/texk/xdvik/squeeze/Makefile.in
index 41d66c31d89..c6a79ae39d8 100644
--- a/Build/source/texk/xdvik/squeeze/Makefile.in
+++ b/Build/source/texk/xdvik/squeeze/Makefile.in
@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -62,6 +63,7 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = squeeze.c
 DIST_SOURCES = squeeze.c
+DATA = $(nodist_noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -159,6 +161,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../../m4
+nodist_noinst_DATA = stamp-squeeze
+CLEANFILES = stamp-squeeze
 all: all-am
 
 .SUFFIXES:
@@ -405,7 +409,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -424,6 +428,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -508,6 +513,9 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am
 
+
+stamp-squeeze: squeeze$(EXEEXT)
+	echo timestamp >$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: