From: Ken Raeburn <raeburn@raeburn.org>
Date: Sun, 23 Aug 2009 04:43:12 +0000 (+0000)
Subject: * Makefile.in (emacs${EXEEXT}) [CANNOT_DUMP]: Set EMACSLOADPATH
X-Git-Tag: emacs-pretest-23.1.90~1725
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8edcc0113a380c15388a1d5ef94b0218df46aad;p=emacs.git

* 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 0859ccb5bbf..cdb12b68846 100644
--- 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 8ee2f6c4ff7..567bff9acea 100644
--- 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.  */