[Emacs-diffs] /srv/bzr/emacs/trunk r100407: * configure.in (MKDEPDIR): Parallel build tweak.

[Glenn Morris]

------------------------------------------------------------
revno: 100407
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-21 09:31:45 -0700
message:
  * configure.in (MKDEPDIR): Parallel build tweak.
  * src/Makefile.in: Comment.
modified:
  ChangeLog
  configure.in
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-21 00:48:14 +0000
+++ b/ChangeLog 2010-05-21 16:31:45 +0000
@@ -1,5 +1,7 @@
 2010-05-21  Glenn Morris  <address@hidden>
 
+       * configure.in (MKDEPDIR): Parallel build tweak.
+
        * configure.in (ns_frag): New output file.
 
        * configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK.

=== modified file 'configure.in'
--- a/configure.in      2010-05-21 00:48:14 +0000
+++ b/configure.in      2010-05-21 16:31:45 +0000
@@ -1376,7 +1376,10 @@
    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

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-21 01:43:44 +0000
+++ b/src/Makefile.in   2010-05-21 16:31:45 +0000
@@ -297,7 +297,6 @@
 ## -MMD -MF ${DEPDIR}/$*.d if AUTO_DEPEND; else empty.
 address@hidden@
 ## test -d ${DEPDIR} || mkdir ${DEPDIR} (if AUTO_DEPEND); else ':'.
-## FIXME This can fail in parallel builds.  Use mkinstalldirs instead?
 address@hidden@
 
 # ========================== start of cpp stuff =======================