* dgnushack.el: If W3DIR is identical to URLDIR, don't add it to `load-path'.

diff --git a/ChangeLog b/ChangeLog
index 1d49001..dedc786 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/dgnushack.el: If W3DIR is identical to URLDIR, don't add it
+       to `load-path'.
+
 2001-09-17  Keiichi Suzuki  <keiichi@nanap.org>
 
        * lisp/gnus-bbdb.el (gnus-bbdb/insert-address-regexp):

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 40f2a78..ee26564 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -55,15 +55,17 @@
 
 (defvar srcdir (or (getenv "srcdir") "."))
 
-(let ((urldir (getenv "URLDIR")))
-  (unless (zerop (length urldir))
-    (push (file-name-as-directory urldir) load-path)))
-
 (defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR")))
                                 (unless (zerop (length w3dir))
                                   (file-name-as-directory w3dir))))
-(when dgnushack-w3-directory
-  (push dgnushack-w3-directory load-path))
+
+(let ((urldir (getenv "URLDIR")))
+  (unless (zerop (length urldir))
+    (setq urldir (file-name-as-directory urldir))
+    (push (file-name-as-directory urldir) load-path))
+  (when (and dgnushack-w3-directory
+            (not (string-equal urldir dgnushack-w3-directory)))
+    (push dgnushack-w3-directory load-path)))
 
 ;; If we are building w3 in a different directory than the source
 ;; directory, we must read *.el from source directory and write *.elc