changeset 16865:0e79ed2e445b

(init_cmdargs): Allow `installation-directory' to be set if either `lib-src' or `info' are found as its subdirectories or siblings.
author Richard M. Stallman <rms@gnu.org>
date Mon, 13 Jan 1997 21:42:33 +0000
parents 59ed508195a4
children 3244576af168
files src/emacs.c
diffstat 1 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/emacs.c	Mon Jan 13 08:45:17 1997 +0000
+++ b/src/emacs.c	Mon Jan 13 21:42:33 1997 +0000
@@ -270,7 +270,14 @@
 	     not including lisp and info.  */
 	  tem = Fexpand_file_name (build_string ("lib-src"), dir);
 	  lib_src_exists = Ffile_exists_p (tem);
-	  if (!NILP (lib_src_exists))
+
+	  /* MSDOS installations frequently remove lib-src, but we still
+	     must set installation-directory, or else info won't find
+	     its files (it uses the value of installation-directory).  */
+	  tem = Fexpand_file_name (build_string ("info"), dir);
+	  info_exists = Ffile_exists_p (tem);
+
+	  if (!NILP (lib_src_exists) || !NILP (info_exists))
 	    {
 	      tem = Fexpand_file_name (build_string ("etc"), dir);
 	      etc_exists = Ffile_exists_p (tem);
@@ -285,7 +292,11 @@
 	  /* See if dir's parent contains those subdirs.  */
 	  tem = Fexpand_file_name (build_string ("../lib-src"), dir);
 	  lib_src_exists = Ffile_exists_p (tem);
-	  if (!NILP (lib_src_exists))
+
+	  tem = Fexpand_file_name (build_string ("../info"), dir);
+	  info_exists = Ffile_exists_p (tem);
+
+	  if (!NILP (lib_src_exists) || !NILP (info_exists))
 	    {
 	      tem = Fexpand_file_name (build_string ("../etc"), dir);
 	      etc_exists = Ffile_exists_p (tem);