Properly handle doc-directory

	* lisp/setup-paths.el (paths-find-doc-directory): use
	exec-directory if configuration-doc-directory is nil as promised
	in the documentation for doc-directory.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>

diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el
index ad3ed76..6f8497a 100644 (file)
--- a/lisp/setup-paths.el
+++ b/lisp/setup-paths.el
@@ -233,7 +233,8 @@ down."
    ;; installed
    (t
     (paths-find-architecture-directory roots nil nil
-                                      configure-doc-directory))))
+                                      (or configure-doc-directory
+                                          exec-directory)))))
 
 (defun paths-find-exec-directory (roots)
   "Find the binary directory."