diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-07-20 19:28:08 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-07-20 19:28:08 +0000 |
| commit | e17f75338abc9037622c7f8b055c62d416dc30fb (patch) | |
| tree | 151858132b85f24c780ede773918d77afd0dd3f6 | |
| parent | 872e2c822b70d61a5aa3ce9a5074da829c2818b5 (diff) | |
| download | emacs-e17f75338abc9037622c7f8b055c62d416dc30fb.tar.gz | |
(init_callproc): Set Vdoc_directory based on
Vinstallation_directory when that's non-nil, regardless of whether
we had to set Vexec_directory.
| -rw-r--r-- | src/callproc.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/callproc.c b/src/callproc.c index ea995b6b09f..3838348f0fb 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -995,7 +995,7 @@ init_callproc_1 () 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 @@ init_callproc () 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 |