Mercurial > emacs
changeset 18771:c0b6ecdf4a2b
(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.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 13 Jul 1997 21:19:52 +0000 |
| parents | 94ca3c126cee |
| children | d8ccd2413041 |
| files | src/lread.c |
| diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lread.c Sun Jul 13 20:52:08 1997 +0000 +++ b/src/lread.c Sun Jul 13 21:19:52 1997 +0000 @@ -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 @@ 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);