[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 b3de81a6ee3: MH-E: handle removal of mhparam libdir from nmh 1.
From: |
Mike Kupfer |
Subject: |
emacs-29 b3de81a6ee3: MH-E: handle removal of mhparam libdir from nmh 1.8 |
Date: |
Fri, 20 Jan 2023 21:09:56 -0500 (EST) |
branch: emacs-29
commit b3de81a6ee3b379fc1dfb9a071e469365081f438
Author: Mike Kupfer <kupfer@rawbw.com>
Commit: Mike Kupfer <kupfer@rawbw.com>
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).
---
lisp/mh-e/mh-e.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 b3de81a6ee3: MH-E: handle removal of mhparam libdir from nmh 1.8,
Mike Kupfer <=