Commit e8dbbf6f authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(bootstrap-clean-CMD, bootstrap-clean-SH): Don't use an old loaddefs.el,

as in Makefile.in.
parent c52e1638
...@@ -286,13 +286,13 @@ recompile: doit ...@@ -286,13 +286,13 @@ recompile: doit
# Prepare a bootstrap in the lisp subdirectory. # 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, # Build loaddefs.el to make sure it's up-to-date. If it's not, that
# that might lead to errors during the bootstrap because something fails to # 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 # autoload as expected. If there is no emacs binary, then we can't
# build autoloads yet, so just make sure there's some loaddefs.el file, as # build autoloads yet. In that case we have to use ldefs-boot.el;
# it's necessary for generating the binary (because loaddefs.el is an # bootstrap should always work with ldefs-boot.el. (Because
# automatically generated file, we don't want to store it in the source # loaddefs.el is an automatically generated file, we don't want to
# repository). # store it in the source repository).
# #
# Remove compiled Lisp files so that bootstrap-emacs will be built from # Remove compiled Lisp files so that bootstrap-emacs will be built from
# sources only. # sources only.
...@@ -302,15 +302,13 @@ bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el ...@@ -302,15 +302,13 @@ bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
bootstrap-clean-CMD: bootstrap-clean-CMD:
# if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads # 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 -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g
bootstrap-clean-SH: bootstrap-clean-SH:
# if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi # if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi
# -rm -f $(lisp)/*.elc $(lisp)/*/*.elc # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
if ! test -r $(lisp)/loaddefs.el; then \ cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \
fi
-for dir in . $(WINS); do rm -f $$dir/*.elc; done -for dir in . $(WINS); do rm -f $$dir/*.elc; done
# Generate/update files for the bootstrap process. # Generate/update files for the bootstrap process.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment