2001-01-31 Dave Love <fx@gnu.org>

[gnus] / lisp / dgnushack.el

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 913c0a8..2d8941a 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,5 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -33,12 +33,15 @@
 
 (defvar srcdir (or (getenv "srcdir") "."))
 
-(push (or (getenv "lispdir") 
+(push (or (getenv "lispdir")
          "/usr/share/emacs/site-lisp")
       load-path)
-(push (or (getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir)) 
+
+(push (or (getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir))
       load-path)
 
+(push "/usr/share/emacs/site-lisp" load-path)
+
 (unless (featurep 'xemacs)
   (define-compiler-macro last (&whole form x &optional n)
     (if (and (fboundp 'last)
@@ -83,7 +86,6 @@
 
 (require 'bytecomp)
 
-(push "/usr/share/emacs/site-lisp" load-path)
 (push srcdir load-path)
 (load (expand-file-name "lpath.el" srcdir) nil t)
 
@@ -117,33 +119,40 @@ Modify to suit your needs."))
   (let ((files (directory-files srcdir nil "^[^=].*\\.el$"))
        ;;(byte-compile-generate-call-tree t)
        file elc)
+    ;; Avoid barfing (from gnus-xmas) because the etc directory is not yet
+    ;; installed.
+    (when (featurep 'xemacs)
+      (setq gnus-xmas-glyph-directory "dummy"))
     (dolist (file '("dgnushack.el" "lpath.el"))
       (setq files (delete file files)))
-    (if (featurep 'base64)
-       (setq files (delete "base64.el" files)))
-    (condition-case ()
-       (require 'w3-forms)
+    (when (featurep 'base64)
+      (setq files (delete "base64.el" files)))
+    (condition-case code
+       (require 'w3-forms)
       (error
+       (message "No w3: %s %s" code (locate-library "w3-forms"))
        (dolist (file '("nnweb.el" "nnlistserv.el" "nnultimate.el"
                       "nnslashdot.el" "nnwarchive.el" "webmail.el"
                       "nnwfm.el"))
         (setq files (delete file files)))))
-    (dolist (file 
+    (dolist (file
             (if (featurep 'xemacs)
                 '("md5.el" "smiley-ems.el")
-              '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el" 
+              '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
                 "nnheaderxm.el" "smiley.el")))
       (setq files (delete file files)))
 
     (dolist (file files)
       (setq file (expand-file-name file srcdir))
-      (when (and (file-exists-p (setq elc (concat file "c")))
+      (when (and (file-exists-p
+                 (setq elc (concat (file-name-nondirectory file) "c")))
                 (file-newer-than-file-p file elc))
        (delete-file elc)))
-    
+
     (while (setq file (pop files))
       (setq file (expand-file-name file srcdir))
-      (when (or (not (file-exists-p (setq elc (concat file "c"))))
+      (when (or (not (file-exists-p
+                     (setq elc (concat (file-name-nondirectory file) "c"))))
                (file-newer-than-file-p file elc))
        (ignore-errors
          (byte-compile-file file))))))
@@ -153,4 +162,3 @@ Modify to suit your needs."))
   (byte-recompile-directory "." 0))
 
 ;;; dgnushack.el ends here
-