Fix problems with CANNOT_DUMP and EMACSLOADPATH.

* leim/Makefile.in (RUN_EMACS):
* lisp/Makefile.in (emacs): Add lisp src to EMACSLOADPATH.
* lisp/loadup.el: Check for src/bootstrap-emacs only when Emacs can dump.
Expand dir too, in case it's relative.
* src/lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.

2 files changed, 13 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e2ff15e4291..36378fd911e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix problems with CANNOT_DUMP and EMACSLOADPATH.
+        * lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.
+
 2013-12-16  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (Fmove_point_visually): Fix subtle bugs in the fallback
diff --git a/src/lread.c b/src/lread.c
index 89bce5e7d25..2bada06f2ad 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4293,8 +4293,14 @@ init_lread (void)
 {
   /* First, set Vload_path.  */
 
-  /* We explicitly ignore EMACSLOADPATH when dumping.  */
-  if (NILP (Vpurify_flag) && egetenv ("EMACSLOADPATH"))
+  /* Ignore EMACSLOADPATH when dumping.  */
+#ifdef CANNOT_DUMP
+  bool use_loadpath = true;
+#else
+  bool use_loadpath = !NILP (Vpurify_flag);
+#endif
+
+  if (use_loadpath && egetenv ("EMACSLOADPATH"))
     {
       Vload_path = decode_env_path ("EMACSLOADPATH", 0, 1);