branch: elpa/jabber
commit 22f154b95396333563a74ef22c3d29e7307d9bcf
Author: Thanos Apollo <[email protected]>
Commit: Thanos Apollo <[email protected]>
omemo: Fix JIT build source path for ELPA installs
---
lisp/jabber-omemo.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lisp/jabber-omemo.el b/lisp/jabber-omemo.el
index 948b66b51b..1d34a273cc 100644
--- a/lisp/jabber-omemo.el
+++ b/lisp/jabber-omemo.el
@@ -124,10 +124,12 @@ the resulting module. Signals an error on build failure."
(message "OMEMO: disabled by jabber-omemo-enable")
(if (require 'jabber-omemo-core nil t)
(setq jabber-omemo--available t)
- (let ((src-dir (expand-file-name
- "../src"
- (file-name-directory
- (or load-file-name buffer-file-name)))))
+ (let* ((this-dir (file-name-directory
+ (or load-file-name buffer-file-name)))
+ (src-dir (if (file-directory-p
+ (expand-file-name "src" this-dir))
+ (expand-file-name "src" this-dir)
+ (expand-file-name "../src" this-dir))))
(if (and (file-exists-p (expand-file-name "jabber-omemo-core.c"
src-dir))
(or noninteractive
(yes-or-no-p
