Mercurial > emacs
changeset 108740:e6ab17110c0d
* configure.in (MKDEPDIR): Parallel build tweak.
* src/Makefile.in: Comment.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 21 May 2010 09:31:45 -0700 |
| parents | ae0f7dfcf9c9 |
| children | 9480d787845f |
| files | ChangeLog configure.in src/Makefile.in |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 21 16:16:42 2010 +0200 +++ b/ChangeLog Fri May 21 09:31:45 2010 -0700 @@ -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.
--- a/configure.in Fri May 21 16:16:42 2010 +0200 +++ b/configure.in Fri May 21 09:31:45 2010 -0700 @@ -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
--- a/src/Makefile.in Fri May 21 16:16:42 2010 +0200 +++ b/src/Makefile.in Fri May 21 09:31:45 2010 -0700 @@ -297,7 +297,6 @@ ## -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 =======================