diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df63f549e82..75b20c33c06 100644 --- 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 058e71f5817..bbae20fd446 100644 --- 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 |