diff options
| author | Mike Kupfer <kupfer@rawbw.com> | 2023-01-16 13:50:49 -0800 |
|---|---|---|
| committer | Mike Kupfer <kupfer@rawbw.com> | 2023-01-20 17:49:09 -0800 |
| commit | b3de81a6ee3b379fc1dfb9a071e469365081f438 (patch) | |
| tree | fdfed0b72980d0daf5b6504f6d175b96175ce526 /lisp/mh-e | |
| parent | d63e1a89518338bc3450b11d6c2d4644cb0440e1 (diff) | |
| download | emacs-b3de81a6ee3b379fc1dfb9a071e469365081f438.tar.gz emacs-b3de81a6ee3b379fc1dfb9a071e469365081f438.tar.bz2 emacs-b3de81a6ee3b379fc1dfb9a071e469365081f438.zip | |
MH-E: handle removal of mhparam libdir from nmh 1.8
* lisp/mh-e/mh-e.el (mh-variant-nmh-info): If "libdir" doesn't
work, try "libexecdir" (Bug#60952) (SF#491).
Diffstat (limited to 'lisp/mh-e')
| -rw-r--r-- | lisp/mh-e/mh-e.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 1640c23e002..34c809a5ecd 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -764,6 +764,8 @@ This assumes that a temporary buffer is set up." ;; Sample '-version' outputs: ;; mhparam -- nmh-1.1-RC1 [compiled on chaak at Fri Jun 20 11:03:28 PDT 2003] ;; install-mh -- nmh-1.7.1 built October 26, 2019 on build-server-000 + ;; "libdir" was deprecated in nmh-1.7 in favor of "libexecdir", and + ;; removed completely in nmh-1.8. (let ((install-mh (expand-file-name "install-mh" dir))) (when (mh-file-command-p install-mh) (erase-buffer) @@ -774,7 +776,8 @@ This assumes that a temporary buffer is set up." (mh-progs dir)) `(,version (variant nmh) - (mh-lib-progs ,(mh-profile-component "libdir")) + (mh-lib-progs ,(or (mh-profile-component "libdir") + (mh-profile-component "libexecdir"))) (mh-lib ,(mh-profile-component "etcdir")) (mh-progs ,dir) (flists ,(file-exists-p |