From 0f337465d5b3ff92b5b8425f83d27ed38abdbc47 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 1 Jun 1997 01:03:51 +0000 Subject: [PATCH] (init_lread): Sometimes add to load-path the lisp and site-lisp dirs under the source directory. --- src/lread.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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)); + } + } } } } -- 2.39.5