From: Glenn Morris <rgm@gnu.org>
Date: Fri, 21 May 2010 16:31:45 +0000 (-0700)
Subject: * configure.in (MKDEPDIR): Parallel build tweak.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~205^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a6dbaceca1daa7f5e86c05eb3e7d4d71dbf40fc;p=emacs.git

* configure.in (MKDEPDIR): Parallel build tweak.
* src/Makefile.in: Comment.
---

diff --git a/ChangeLog b/ChangeLog
index 53424301efd..54acf51ccf3 100644
--- 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 6d82a20351b..36359e25072 100644
--- 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 625eebfad0b..554caa44a97 100644
--- 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 =======================