From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 13 Jul 1997 21:19:52 +0000 (+0000)
Subject: (init_lread): Don't add to load-path lisp subdirectories
X-Git-Tag: emacs-20.1~1175
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33046fc90de69e4fd4c196f62815e3f290702354;p=emacs.git

(init_lread): Don't add to load-path lisp subdirectories
of the source tree if the parent of the source was moved after dumping Emacs.
---

diff --git a/src/lread.c b/src/lread.c
index 22acdda6bfa..7f718dce681 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1,6 +1,6 @@
 /* Lisp parsing and input streams.
-   Copyright (C) 1985, 1986, 1987, 1988, 1989, 
-   1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 1997
+      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2534,10 +2534,20 @@ init_lread ()
 
 	      if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
 		{
+		  Lisp_Object tem2;
+
 		  tem = Fexpand_file_name (build_string ("src/Makefile"),
 					   Vinstallation_directory);
 		  tem1 = Ffile_exists_p (tem);
-		  if (!NILP (tem1))
+
+		  /* Don't be fooled if they moved the entire source tree
+		     AFTER dumping Emacs.  If the build directory is indeed
+		     different from the source dir, src/Makefile.in and
+		     src/Makefile will not be found together.  */
+		  tem = Fexpand_file_name (build_string ("src/Makefile.in"),
+					   Vinstallation_directory);
+		  tem2 = Ffile_exists_p (tem);
+		  if (!NILP (tem1) && NILP (tem2))
 		    {
 		      tem = Fexpand_file_name (build_string ("lisp"),
 					       Vsource_directory);