Mercurial > emacs
changeset 12615:d5db61e1a4ee
(init_callproc): Set Vdoc_directory based on
Vinstallation_directory when that's non-nil, regardless of whether
we had to set Vexec_directory.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 20 Jul 1995 19:28:08 +0000 |
| parents | 1415c961bea6 |
| children | ca170048a679 |
| files | src/callproc.c |
| diffstat | 1 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/callproc.c Thu Jul 20 18:30:49 1995 +0000 +++ b/src/callproc.c Thu Jul 20 19:28:08 1995 +0000 @@ -995,7 +995,7 @@ Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path); } -/* This is run after init_cmdargs, so that Vinvocation_directory is valid. */ +/* This is run after init_cmdargs, when Vinstallation_directory is valid. */ init_callproc () { @@ -1017,21 +1017,20 @@ Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil)); Vexec_directory = Ffile_name_as_directory (tem); #endif /* not DOS_NT */ + } - /* If we use ../lib-src, maybe use ../etc as well. - Do so if ../etc exists and has our DOC-... file in it. */ - if (data_dir == 0) - { - tem = Fexpand_file_name (build_string ("etc"), - Vinstallation_directory); - Vdoc_directory = Ffile_name_as_directory (tem); - } + /* Maybe use ../etc as well as ../lib-src. */ + if (data_dir == 0) + { + tem = Fexpand_file_name (build_string ("etc"), + Vinstallation_directory); + Vdoc_directory = Ffile_name_as_directory (tem); } } /* Look for the files that should be in etc. We don't use Vinstallation_directory, because these files are never installed - in /bin near the executable, and they are never in the build + near the executable, and they are never in the build directory when that's different from the source directory. Instead, if these files are not in the nominal place, we try the