mh-utils doesn't find correct paths

[Mats Bengtsson]

This bug report will be sent to the Free Software Foundation,
 not to your local site managers!!
Please write in English, because the Emacs maintainers do not have
translators to read other languages for them.

In GNU Emacs 20.7.1 (i686-pc-linux-gnu, X toolkit)
 of Wed May 30 2001 on endor.e.kth.se
configured using `configure  --prefix=/mpkg/emacs/20.7'

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

On our system, nmh is installed in a directory 
.../nmh/1.0.4/ with subdirectories bin/ lib/ etc/ and so on.
This means that the function mh-find-progs in mh-utils.el
isn't able to find the correct values of the variables
mh-lib and mh-lib-progs. On our system they should be set to
.../nmh/1.0.4/etc/ and .../nmh/1.0.4/lib/, respectively.

The following patch solves the problem on our installation
and shouldn't break other systems as far as I understand.

diff -u /share/emacs/20.7/lisp/mail/mh-utils.el.orig 
/share/emacs/20.7/lisp/mail/mh-utils.el
--- /share/emacs/20.7/lisp/mail/mh-utils.el.orig    Thu Apr  8 01:39:22 1999
+++ /share/emacs/20.7/lisp/mail/mh-utils.el       Mon Jun 18 18:10:06 2001
@@ -629,7 +629,7 @@
                  ;; components, then look for lib/mh or mh/lib.
                  (or (mh-path-search
                       (mapcar (lambda (p) (expand-file-name p mh-base))
-                              '("lib/mh" "etc/nmh" "/etc/nmh" "mh/lib"))
+                              '("lib/mh" "etc/nmh" "etc" "lib" "/etc/nmh" 
"mh/lib"))
                       "components"
                       'file-exists-p))))
        (or (and mh-lib-progs
@@ -637,7 +637,7 @@
            (setq mh-lib-progs
                  (or (mh-path-search
                       (mapcar (lambda (p) (expand-file-name p mh-base))
-                              '("lib/mh" "libexec/nmh" "lib/nmh" "mh/lib"))
+                              '("lib/mh" "libexec/nmh" "lib/nmh" "mh/lib" 
"lib"))
                       "mhl")
                      (mh-path-search '("/usr/local/bin/mh/") "mhl")
                      (mh-path-search exec-path "mhl") ;unlikely


Best regards

        Mats Bengtsson
        Signal Processing
        Signals, Sensors and Systems
        Royal Institute of Technology
        SE-100 44  STOCKHOLM
        Sweden
        Phone: (+46) 8 790 8463                         
        Fax:   (+46) 8 790 7260
        Email: matsb@s3.kth.se
        WWW: http://www.s3.kth.se/~matsb