build system: Avoid 'parallel make' problems

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

23 files changed, 90 insertions, 43 deletions

diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index b9cf8532854..52b4d17f718 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/rebuild.am: Avoid more 'parallel make' problems.
+
 2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/*.am: Moved Makefile fragments from libs/am/ and tekk/am/.
diff --git a/Build/source/am/rebuild.am b/Build/source/am/rebuild.am
index 2713eb287fc..db8f5b11fca 100644
--- a/Build/source/am/rebuild.am
+++ b/Build/source/am/rebuild.am
@@ -22,12 +22,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 CLEANFILES += rebuild.stamp
diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in
index d631d18eacc..c7572798d22 100644
--- a/Build/source/libs/cairo/Makefile.in
+++ b/Build/source/libs/cairo/Makefile.in
@@ -2330,12 +2330,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in
index c49816903d7..e179eda8694 100644
--- a/Build/source/libs/freetype/Makefile.in
+++ b/Build/source/libs/freetype/Makefile.in
@@ -604,12 +604,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index b41412fe8db..fac534fb461 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -613,12 +613,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index da1048ce098..2e7ed79e285 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -1207,12 +1207,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in
index 60619a30c55..e4b9c6613e0 100644
--- a/Build/source/libs/graphite2/Makefile.in
+++ b/Build/source/libs/graphite2/Makefile.in
@@ -1736,12 +1736,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index aa70e810e6f..426e344d37d 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -1690,12 +1690,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index daa03d9f31f..0cfdd6d0488 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -1326,12 +1326,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index 279e98a56d6..761f983af1f 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -1365,12 +1365,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in
index 91dcd0e4959..8ae31b5b2ba 100644
--- a/Build/source/libs/lua52/Makefile.in
+++ b/Build/source/libs/lua52/Makefile.in
@@ -1035,12 +1035,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in
index 00c6e9a85ee..76796586aa4 100644
--- a/Build/source/libs/pixman/Makefile.in
+++ b/Build/source/libs/pixman/Makefile.in
@@ -1474,12 +1474,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 04398daabb3..4904bc5f904 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -1413,12 +1413,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/potrace/Makefile.in b/Build/source/libs/potrace/Makefile.in
index f66e26bd43d..180d286dfde 100644
--- a/Build/source/libs/potrace/Makefile.in
+++ b/Build/source/libs/potrace/Makefile.in
@@ -1304,12 +1304,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index df25d0e5fbd..6bb97dbd408 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -1398,12 +1398,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index 2ec5c027aee..02a5f180f2f 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -1165,12 +1165,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index b5f4b2bc37e..e399bfc3110 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -1368,12 +1368,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in
index 76bea30d009..19fbc516883 100644
--- a/Build/source/libs/zziplib/Makefile.in
+++ b/Build/source/libs/zziplib/Makefile.in
@@ -1371,12 +1371,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index c09f2746234..6dfa18d4ddf 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -2297,12 +2297,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in
index 43017e38390..1aca1351c85 100644
--- a/Build/source/texk/ptexenc/Makefile.in
+++ b/Build/source/texk/ptexenc/Makefile.in
@@ -950,12 +950,13 @@ rebuild: $(rebuild_prereq)
 	if test -f rebuild.stamp; then :; else \
 	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
 	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) \
+	      && echo timestamp >rebuild.stamp; \
 	    $$dry rmdir rebuild.lock; \
 	  else \
 	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	    $$dry test -f rebuild.stamp; exit $$?; \
 	  fi; \
+	  $$dry test -f rebuild.stamp; exit $$?; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index c57ccf7bab7..1ad327d949c 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (w2c/config.h): Avoid 'parallel make' problems.
+
 2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* cvtbib.sed: Generate bibtex.c to first #include "cpascal.h".
diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am
index 54ef2858739..7a150f41411 100644
--- a/Build/source/texk/web2c/web2c/Makefile.am
+++ b/Build/source/texk/web2c/web2c/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/
 ##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../../m4
@@ -17,8 +17,18 @@ DISTCLEANFILES = w2c/config.h
 
 # Don't include our <c-auto.h>.
 w2c/config.h: ../w2c/config.h
-	$(AM_V_at)$(MKDIR_P) w2c
-	$(AM_V_GEN)sed -e '/c-auto\.h>/d' $(srcdir)/../w2c/config.h >$@
+	@if test -f $@; then :; else \
+	  trap 'rm -rf w2c.lock' 1 2 13 15; \
+	  if mkdir w2c.lock 2>/dev/null; then \
+	    $(MKDIR_P) w2c; \
+	    if $(AM_V_P); then :; else echo "  GEN      $@"; fi; \
+	    sed -e '/c-auto\.h>/d' $(srcdir)/../w2c/config.h >$@; \
+	    rmdir w2c.lock; \
+	  else \
+	    while test -d w2c.lock; do sleep 1; done; \
+	  fi; \
+	  test -f $@; \
+	fi
 
 noinst_HEADERS = coerce.h
 
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 22a9de8ba4a..2ffc1adcd80 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -894,8 +894,18 @@ uninstall-am:
 
 # Don't include our <c-auto.h>.
 w2c/config.h: ../w2c/config.h
-	$(AM_V_at)$(MKDIR_P) w2c
-	$(AM_V_GEN)sed -e '/c-auto\.h>/d' $(srcdir)/../w2c/config.h >$@
+	@if test -f $@; then :; else \
+	  trap 'rm -rf w2c.lock' 1 2 13 15; \
+	  if mkdir w2c.lock 2>/dev/null; then \
+	    $(MKDIR_P) w2c; \
+	    if $(AM_V_P); then :; else echo "  GEN      $@"; fi; \
+	    sed -e '/c-auto\.h>/d' $(srcdir)/../w2c/config.h >$@; \
+	    rmdir w2c.lock; \
+	  else \
+	    while test -d w2c.lock; do sleep 1; done; \
+	  fi; \
+	  test -f $@; \
+	fi
 
 $(web2c_OBJECTS): web2c-parser.h w2c/config.h