[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in

[Eli Zaretskii]

Index: emacs/lisp/makefile.w32-in
diff -c emacs/lisp/makefile.w32-in:1.41 emacs/lisp/makefile.w32-in:1.42
*** emacs/lisp/makefile.w32-in:1.41     Wed Apr 13 09:44:52 2005
--- emacs/lisp/makefile.w32-in  Sun Jun 12 11:27:31 2005
***************
*** 286,298 ****
  
  # 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).
  #
  # Remove compiled Lisp files so that bootstrap-emacs will be built from
  # sources only.
--- 286,298 ----
  
  # Prepare a bootstrap in the lisp subdirectory.
  #
! # 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,316 ****
  
  bootstrap-clean-CMD:
  #     if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
!       if not exist $(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
        -for dir in . $(WINS); do rm -f $$dir/*.elc; done
  
  # Generate/update files for the bootstrap process.
--- 302,314 ----
  
  bootstrap-clean-CMD:
  #     if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
!       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
!       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.