Merge pull request vedang#290 from thblt/master

Support Git clone installation (closes vedang#287)
fw623 · Jul 21, 2017 · 804d992 · 804d992
2 parents f314597 + e35c958
commit 804d992
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el
@@ -62,11 +62,11 @@
   :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))))
+                      (cl-find-if 'file-exists-p
+                                  `(,(expand-file-name "../server" dir)
+                                    ,dir))))
   "Filename of the epdfinfo executable."
   :group 'pdf-info
   :type '(file :must-match t))