From: Miles Bader <miles@gnu.org>
Date: Tue, 16 Sep 2003 02:40:49 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-48
X-Git-Tag: ttn-vms-21-2-B4~8830
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54ab09c42868e33feeb0e9eb84277c970d0bb675;p=emacs.git

Revision: miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-48

Add loaddefs.el bootstrapping to lisp/makefile.w32-in
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cc8d7101be..08fda595153 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-16  Miles Bader  <miles@gnu.ai.mit.edu>
+
+	From David Ponce <david.ponce@wanadoo.fr>:
+	* makefile.w32-in (DONTCOMPILE): Add loaddefs-boot.el.
+	(bootstrap-clean-CMD, bootstrap-clean-SH): Recreate loaddefs.el
+	from loaddefs-boot.el if necessary.
+
 2003-09-15  Zoltan Kemenczy <kemenczy@rogers.com>
 
 	* progmodes/gud.el (gud-find-class): Make jdb work again since
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index e7f020e33b7..515c9f3bb72 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -87,6 +87,7 @@ DONTCOMPILE = \
 	$(lisp)/language/utf-8-lang.el \
 	$(lisp)/language/georgian.el \
 	$(lisp)/loaddefs.el \
+	$(lisp)/loaddefs-boot.el \
 	$(lisp)/loadup.el \
 	$(lisp)/mail/blessmail.el \
 	$(lisp)/patcomp.el \
@@ -352,22 +353,33 @@ compile-after-backup: backup-compiled-files compile-always
 recompile: doit
 	$(emacs) -f batch-byte-recompile-directory $(lisp)
 
-# 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.  Remove compiled Lisp files so that
-# bootstrap-emacs will be built from sources only.
+# 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.
 
 # Need separate version for sh and native cmd.exe
 bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
 
 bootstrap-clean-CMD:
 #	if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
+	if not exist $(lisp)\loaddefs.el cp $(lisp)/loaddefs-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)/loaddefs-boot.el $(lisp)/loaddefs.el; \
+	fi
 	-for dir in . $(WINS); do rm -f $$dir/*.elc; done
 
 # Generate/update files for the bootstrap process.