summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-15 14:58:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-15 14:58:07 +0000
commitd5ff083c5b5321afc523ceeb658fef25d337e7bf (patch)
tree35e00d41a671711deb95a0986f7454ebd7ed1885 /Build/source/texk/web2c/web2c
parent752c7b0e0a3d65065694c1ecd571efc2cd9f1df6 (diff)
build system: Avoid 'parallel make' problems
git-svn-id: svn://tug.org/texlive/trunk@31199 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/web2c')
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.am16
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.in14
3 files changed, 29 insertions, 5 deletions
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