(bootstrap-clean): Run bootstrap-clean-$(SHELLTYPE) explicitly in a recursive

Make, not implicitly through prerequisites, since the latter is wrong under
parallel builds.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df63f549e8215a6831e93148210cce584a492dc3..75b20c33c069ae8843c8f1d4f8c6e7f0f774fcc4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-23  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (bootstrap-clean): Run bootstrap-clean-$(SHELLTYPE)
+       explicitly in a recursive Make, not implicitly through prerequisites,
+       since the latter is wrong under parallel builds.
+
 2006-12-22  Eli Zaretskii  <eliz@gnu.org>
 
        * w32-fns.el (convert-standard-filename): Wrap in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 058e71f5817fbb249338164922260ef0d409bacb..bbae20fd4465994ec139d30d67b6829af1d91371 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -371,7 +371,12 @@ pre-mh-loaddefs.el-CMD:
 # sources only.
 
 # Need separate version for sh and native cmd.exe
-bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el
+# Note that bootstrap-clean-$(SHELLTYPE) copies ldefs-boot.el to loaddefs.el,
+# and thus the almost-empty loaddefs.el crafted by the $(lisp)/loaddefs.el
+# target can NOT be built _after_ bootstrap-clean-$(SHELLTYPE) does its
+# thing, or else an empty loaddefs.el will overwrite the full one.
+bootstrap-clean: $(lisp)/loaddefs.el
+       $(MAKE) $(MFLAGS) bootstrap-clean-$(SHELLTYPE)
 
 bootstrap-clean-CMD:
 #      if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads