diff options
| -rw-r--r-- | lisp/makefile.w32-in | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 54be26a1675..b4569c26140 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -286,13 +286,13 @@ recompile: doit # Prepare a bootstrap in the lisp subdirectory. # -# Build loaddefs.el, because it's not sure it's up-to-date, and if it's not, -# that might lead to errors during the bootstrap because something fails to -# autoload as expected. However, if there is no emacs binary, then we can't -# build autoloads yet, so just make sure there's some loaddefs.el file, as -# it's necessary for generating the binary (because loaddefs.el is an -# automatically generated file, we don't want to store it in the source -# repository). +# Build loaddefs.el to make sure it's up-to-date. If it's not, that +# might lead to errors during the bootstrap because something fails to +# autoload as expected. If there is no emacs binary, then we can't +# build autoloads yet. In that case we have to use ldefs-boot.el; +# bootstrap should always work with ldefs-boot.el. (Because +# loaddefs.el is an automatically generated file, we don't want to +# store it in the source repository). # # Remove compiled Lisp files so that bootstrap-emacs will be built from # sources only. @@ -302,15 +302,13 @@ bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el bootstrap-clean-CMD: # if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads - if not exist $(lisp)\loaddefs.el cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el + cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g bootstrap-clean-SH: # if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc - if ! test -r $(lisp)/loaddefs.el; then \ - cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \ - fi + cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el -for dir in . $(WINS); do rm -f $$dir/*.elc; done # Generate/update files for the bootstrap process. |