# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1207920434 0
# Node ID 96f9ff09bbb02c01bc167225569f6cf67a719c3f
# Parent  ee22366f2a68b4197423c18200f401e625761292
* Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.
* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.

diff -r ee22366f2a68 -r 96f9ff09bbb0 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Apr 11 07:44:49 2008 +0000
+++ b/lisp/ChangeLog	Fri Apr 11 13:27:14 2008 +0000
@@ -1,3 +1,8 @@
+2008-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.
+	* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.
+
 2008-04-11  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* tooltip.el (tooltip-show-help-non-mode): Set message-truncate-lines
diff -r ee22366f2a68 -r 96f9ff09bbb0 lisp/Makefile.in
--- a/lisp/Makefile.in	Fri Apr 11 07:44:49 2008 +0000
+++ b/lisp/Makefile.in	Fri Apr 11 13:27:14 2008 +0000
@@ -311,11 +311,8 @@
 bootstrap-prepare:
 	if test -x $(EMACS); then				\
 	  $(MAKE) $(MFLAGS) autoloads;				\
-	else							\
-	  cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el;		\
 	fi
-	chmod +w $(lisp)/loaddefs.el		\
-	  $(lisp)/ps-print.el			\
+	chmod +w $(lisp)/ps-print.el			\
 	  $(lisp)/emacs-lisp/cl-loaddefs.el
 
 maintainer-clean: distclean bootstrap-clean
diff -r ee22366f2a68 -r 96f9ff09bbb0 lisp/loadup.el
--- a/lisp/loadup.el	Fri Apr 11 07:44:49 2008 +0000
+++ b/lisp/loadup.el	Fri Apr 11 13:27:14 2008 +0000
@@ -81,7 +81,13 @@
 (message "Lists of integers (garbage collection statistics) are normal output")
 (message "while building Emacs; they do not indicate a problem.")
 (message "%s" (garbage-collect))
-(load "loaddefs.el")  ;Don't get confused if someone compiled this by mistake.
+
+(condition-case nil
+    ;; Don't get confused if someone compiled this by mistake.
+    (load "loaddefs.el")
+  ;; In case loaddefs hasn't been generated yet.
+  (file-error (load "ldefs-boot.el")))
+
 (message "%s" (garbage-collect))
 (load "simple")