Mercurial > emacs

changeset 18084:6f264bb70b49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(init_lread): Sometimes add to load-path the lisp and site-lisp dirs under the source directory.
author Richard M. Stallman <rms@gnu.org>
date Sun, 01 Jun 1997 01:03:51 +0000
parents c361afa561c5
children 3da4eaba1fe8
files src/lread.c
diffstat 1 files changed, 26 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/lread.c	Sun Jun 01 00:30:01 1997 +0000
+++ b/src/lread.c	Sun Jun 01 01:03:51 1997 +0000
@@ -2511,6 +2511,32 @@
 		  if (NILP (Fmember (tem, Vload_path)))
 		    Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
 		}
+
+	      /* If Emacs was not built in the source directory,
+		 and it is run from where it was built,
+		 add to load-path
+		 the lisp and site-lisp dirs under the source directory.  */
+
+	      if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
+		{
+		  tem = Fexpand_file_name (build_string ("src/Makefile"),
+					   Vinstallation_directory);
+		  tem1 = Ffile_exists_p (tem);
+		  if (!NILP (tem1))
+		    {
+		      tem = Fexpand_file_name (build_string ("lisp"),
+					       Vsource_directory);
+
+		      if (NILP (Fmember (tem, Vload_path)))
+			Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+
+		      tem = Fexpand_file_name (build_string ("site-lisp"),
+					       Vsource_directory);
+
+		      if (NILP (Fmember (tem, Vload_path)))
+			Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+		    }
+		}
 	    }
 	}
     }