* Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.

* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.

3 files changed, 13 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 557e43f6df4..445e84e9bd3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/Makefile.in b/lisp/Makefile.in
index ebbb9a6a2d6..eddd50871cd 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -311,11 +311,8 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
 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 --git a/lisp/loadup.el b/lisp/loadup.el
index b3deea67fbe..8581f05fedb 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -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")