From ae715ccd3b79c0d97c7aa16dbcadfb2fdd562251 Mon Sep 17 00:00:00 2001 From: thblt Date: Thu, 20 Jul 2017 12:08:34 +0200 Subject: Support Git clone installation Let the default value of 'pdf-info-epdfinfo-program' automatically determine if PDF Tools is installed as a Melpa package (where the epdfinfo binary is in ./build) or as a Git clone (where it's found at ../server/) --- lisp/pdf-info.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el index 3167f03..fbe6e71 100644 --- a/lisp/pdf-info.el +++ b/lisp/pdf-info.el @@ -62,11 +62,13 @@ :group 'pdf-tools) (defcustom pdf-info-epdfinfo-program - (expand-file-name (if (eq system-type 'windows-nt) - "epdfinfo.exe" - "epdfinfo") - (file-name-directory - (or load-file-name default-directory))) + (expand-file-name (if (eq system-type 'windows-nt) "epdfinfo.exe" "epdfinfo") + (let ((dir (file-name-directory (or load-file-name default-directory)))) + (find-if 'file-exists-p + `(,(expand-file-name "build" dir) + ,(expand-file-name "../server" dir) + dir) + ))) "Filename of the epdfinfo executable." :group 'pdf-info :type '(file :must-match t)) -- cgit v1.2.3