# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 799997815 0
# Node ID fe6619d546fde381945e79914fe9f1ba871a2321
# Parent  6ae23eecab6ac18cb3269bc4002eee5d5ae54d4f
(Info-directory-list): Use installation-directory,
not invocation-directory.  Cope if it is nil.

diff -r 6ae23eecab6a -r fe6619d546fd lisp/info.el
--- a/lisp/info.el	Tue May 09 05:35:45 1995 +0000
+++ b/lisp/info.el	Tue May 09 05:36:55 1995 +0000
@@ -58,7 +58,8 @@
 	(sep (if (or (eq system-type 'ms-dos) 
 		     (eq system-type 'windows-nt))
 		 ";" ":"))
-	(sibling (expand-file-name "../info/" (invocation-directory))))
+	(sibling (if installation-directory
+		     (expand-file-name "info/" installation-directory))))
     (if path
 	(let ((list nil)
 	      idx)
@@ -68,7 +69,8 @@
 		  path (substring path (min (1+ idx)
 					    (length path)))))
 	  (nreverse list))
-      (if (or (member sibling Info-default-directory-list)
+      (if (or (null sibling)
+	      (member sibling Info-default-directory-list)
 	      (not (file-exists-p sibling))
 	      ;; On DOS/NT, we use movable executables always,
 	      ;; and we must always find the Info dir at run time.
@@ -77,8 +79,8 @@
 		;; Use invocation-directory for Info only if we used it for
 		;; exec-directory also.
 		(not (string= exec-directory
-			      (expand-file-name "../lib-src/"
-						(invocation-directory))))))
+			      (expand-file-name "lib-src/"
+						installation-directory)))))
 	  Info-default-directory-list
 	(reverse (cons sibling (cdr (reverse Info-default-directory-list)))))))
   "List of directories to search for Info documentation files.