* configure.in (MKDEPDIR): Parallel build tweak.

* src/Makefile.in: Comment.

diff --git a/ChangeLog b/ChangeLog
index 53424301efdc6b7100d583af5854b80a289ef8c4..54acf51ccf3c630798187958b845bf36f194588e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-21  Glenn Morris  <rgm@gnu.org>
 
+       * configure.in (MKDEPDIR): Parallel build tweak.
+
        * configure.in (ns_frag): New output file.
 
        * configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK.

diff --git a/configure.in b/configure.in
index 6d82a20351ba6f751d03d6d55ecb1e87af02b8fd..36359e25072e2ae4b6ea1b04f6694d029082d4c6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1376,7 +1376,10 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
    fi
    if test $ac_enable_autodepend = yes; then
       DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d'
-      MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR}'
+      ## In parallel builds, another make might create depdir between
+      ## the first test and mkdir, so stick another test on the end.
+      ## Or use mkinstalldirs?  mkdir -p is not portable.
+      MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR} || test -d ${DEPDIR}'
       deps_frag=autodeps.mk
    fi
 fi

diff --git a/src/Makefile.in b/src/Makefile.in
index 625eebfad0bdab85d82862fe586f527549654863..554caa44a9715d7a184f59235d378b6b8f952e0b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -297,7 +297,6 @@ DEPDIR=deps
 ## -MMD -MF ${DEPDIR}/$*.d if AUTO_DEPEND; else empty.
 DEPFLAGS=@DEPFLAGS@
 ## test -d ${DEPDIR} || mkdir ${DEPDIR} (if AUTO_DEPEND); else ':'.
-## FIXME This can fail in parallel builds.  Use mkinstalldirs instead?
 MKDEPDIR=@MKDEPDIR@
 
 # ========================== start of cpp stuff =======================