# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 923528898 0
# Node ID 869c9511ad3c0fe02c4468c4006b6dda67a70076
# Parent  07962af1ae684036a34d9d86b2b556e9ec0516b4
(mh-find-progs): Try /etc/nmh and lib/nmh dirs.

diff -r 07962af1ae68 -r 869c9511ad3c lisp/mail/mh-utils.el
--- a/lisp/mail/mh-utils.el	Wed Apr 07 23:45:36 1999 +0000
+++ b/lisp/mail/mh-utils.el	Wed Apr 07 23:48:18 1999 +0000
@@ -628,18 +628,16 @@
 		  ;; directory:  Strip any trailing `mh' or `bin' path
 		  ;; components, then look for lib/mh or mh/lib.
 		  (or (mh-path-search
-		       (list (expand-file-name "lib/mh" mh-base)
-			     (expand-file-name "etc/nmh" mh-base) ; NetBSD
-			     (expand-file-name "mh/lib" mh-base))
+		       (mapcar (lambda (p) (expand-file-name p mh-base))
+			       '("lib/mh" "etc/nmh" "/etc/nmh" "mh/lib"))
 		       "components"
 		       'file-exists-p))))
 	(or (and mh-lib-progs
 		 (mh-file-command-p (expand-file-name "mhl" mh-lib-progs)))
 	    (setq mh-lib-progs
 		  (or (mh-path-search
-		       (list (expand-file-name "lib/mh" mh-base)
-			     (expand-file-name "libexec/nmh" mh-base) ; NetBSD
-			     (expand-file-name "mh/lib" mh-base))
+		       (mapcar (lambda (p) (expand-file-name p mh-base))
+			       '("lib/mh" "libexec/nmh" "lib/nmh" "mh/lib"))
 		       "mhl")
 		      (mh-path-search '("/usr/local/bin/mh/") "mhl")
 		      (mh-path-search exec-path "mhl") ;unlikely