* Makefile.in (emacs${EXEEXT}) [CANNOT_DUMP]: Set EMACSLOADPATH

before invoking the newly build emacs to check for load-path
shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0859ccb..cdb12b6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-23  Ken Raeburn  <raeburn@raeburn.org>
+
+       * Makefile.in (emacs${EXEEXT}) [CANNOT_DUMP]: Set EMACSLOADPATH
+       before invoking the newly build emacs to check for load-path
+       shadowing.
+
 2009-08-22  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (bootstrap_exe): New variable.

diff --git a/src/Makefile.in b/src/Makefile.in
index 8ee2f6c..567bff9 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -908,13 +908,14 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP}
 #ifdef CANNOT_DUMP
        rm -f emacs${EXEEXT}
        ln temacs${EXEEXT} emacs${EXEEXT}
+       -EMACSLOADPATH=${lispsource} ./emacs -q -batch -f list-load-path-shadows
 #else
        LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
        @: This new Emacs is as functional and more efficient then
        @: bootstrap-emacs, so let us replace it.
        -ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
-#endif /* ! defined (CANNOT_DUMP) */
        -./emacs -q -batch -f list-load-path-shadows
+#endif /* ! defined (CANNOT_DUMP) */
 
 /* We run make-docfile twice because the command line may get too long
    on some systems.  */