Sync up with r21-4-10-utf-2000-0_20-=gt.

[chise/xemacs-chise.git] / lisp / update-elc.el

diff --git a/lisp/update-elc.el b/lisp/update-elc.el
index d9c33c8..777017a 100644 (file)
--- a/lisp/update-elc.el
+++ b/lisp/update-elc.el
@@ -1,8 +1,9 @@
 ;;; update-elc.el --- Bytecompile out-of-date dumped files
 
 ;; Copyright (C) 1997 Free Software Foundation, Inc.
-;; Copyright (C) 1996 Unknown
+;; Copyright (C) 1996 Sun Microsystems, Inc.
 
+;; Author: Ben Wing <ben@xemacs.org>, Steven L Baur <steve@xemacs.org>
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: internal
 
@@ -39,6 +40,8 @@
 ;; (the idea here is that you can bootstrap if your .ELC files
 ;; are missing or badly out-of-date)
 
+;; See also update-elc-2.el
+
 ;;; Code:
 
 (defvar processed nil)
@@ -115,14 +118,18 @@
             (if (string-match "\\.elc?\\'" arg)
                 (substring arg 0 (match-beginning 0))
               arg)))
-           (if (and dumped-exe
-                    (or (and (file-exists-p (concat frob ".el"))
-                             (file-newer-than-file-p (concat frob ".el")
-                                                     dumped-exe))
-                        (and (file-exists-p (concat frob ".elc"))
-                             (file-newer-than-file-p (concat frob ".elc")
-                                                     dumped-exe))))
-               (setq need-to-dump t)))
+           (when (and dumped-exe
+                      (or (and (file-exists-p
+                                (concat "../lisp/" frob ".el"))
+                               (file-newer-than-file-p
+                                (concat "../lisp/" frob ".el")
+                                dumped-exe))
+                          (and (file-exists-p
+                                (concat "../lisp/" frob ".elc"))
+                               (file-newer-than-file-p
+                                (concat "../lisp/" frob ".elc")
+                                dumped-exe))))
+             (setq need-to-dump t)))
 
       (if (null (member (file-name-nondirectory arg)
                        packages-unbytecompiled-lisp))