From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 1 Jun 1997 01:03:51 +0000 (+0000)
Subject: (init_lread): Sometimes add to load-path
X-Git-Tag: emacs-20.1~1862
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f337465d5b3ff92b5b8425f83d27ed38abdbc47;p=emacs.git

(init_lread): Sometimes add to load-path
the lisp and site-lisp dirs under the source directory.
---

diff --git a/src/lread.c b/src/lread.c
index 147114743b6..12482552cd3 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2511,6 +2511,32 @@ init_lread ()
 		  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));
+		    }
+		}
 	    }
 	}
     }