Minor loadup.el fix.

* lisp/loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
having a relative path in src/Makefile.in.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6aebdd8f132268f3e176f1c45aac9281abfda2d..de5fd0477c2414108c891f631b203275dc9f369d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
+       having a relative path in src/Makefile.in.
+
 2010-05-20  Kevin Ryde  <user42@zip.com.au>
 
        * help-mode.el (help-make-xrefs): For Info node links turn

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36bf8dea082c2860bf1250d82388cf05ae2dfbe8..b087aa79040723ea55f8f6e53478d7ab981c3240 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -54,7 +54,7 @@
        (equal (nth 3 command-line-args) "unidata-gen.el")
        (equal (nth 4 command-line-args) "unidata-gen-files")
        ;; In case CANNOT_DUMP.
-       (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
+       (string-match "src/bootstrap-emacs" (nth 0 command-line-args)))
     (let ((dir (car load-path)))
       ;; We'll probably overflow the pure space.
       (setq purify-flag nil)