Commit 70344b34 authored by Eli Zaretskii's avatar Eli Zaretskii

(init_cmdargs) [MSDOS]: Make the change that sets

`installation-directory' if `info' is found as its subdirectory or
sibling, be conditioned on MSDOS (it makes trouble on Unix).
parent 78897d3d
...@@ -271,11 +271,15 @@ init_cmdargs (argc, argv, skip_args) ...@@ -271,11 +271,15 @@ init_cmdargs (argc, argv, skip_args)
tem = Fexpand_file_name (build_string ("lib-src"), dir); tem = Fexpand_file_name (build_string ("lib-src"), dir);
lib_src_exists = Ffile_exists_p (tem); lib_src_exists = Ffile_exists_p (tem);
#ifdef MSDOS
/* MSDOS installations frequently remove lib-src, but we still /* MSDOS installations frequently remove lib-src, but we still
must set installation-directory, or else info won't find must set installation-directory, or else info won't find
its files (it uses the value of installation-directory). */ its files (it uses the value of installation-directory). */
tem = Fexpand_file_name (build_string ("info"), dir); tem = Fexpand_file_name (build_string ("info"), dir);
info_exists = Ffile_exists_p (tem); info_exists = Ffile_exists_p (tem);
#else
info_exists = Qnil;
#endif
if (!NILP (lib_src_exists) || !NILP (info_exists)) if (!NILP (lib_src_exists) || !NILP (info_exists))
{ {
...@@ -293,8 +297,14 @@ init_cmdargs (argc, argv, skip_args) ...@@ -293,8 +297,14 @@ init_cmdargs (argc, argv, skip_args)
tem = Fexpand_file_name (build_string ("../lib-src"), dir); tem = Fexpand_file_name (build_string ("../lib-src"), dir);
lib_src_exists = Ffile_exists_p (tem); lib_src_exists = Ffile_exists_p (tem);
#ifdef MSDOS
/* See the MSDOS commentary above. */
tem = Fexpand_file_name (build_string ("../info"), dir); tem = Fexpand_file_name (build_string ("../info"), dir);
info_exists = Ffile_exists_p (tem); info_exists = Ffile_exists_p (tem);
#else
info_exists = Qnil;
#endif
if (!NILP (lib_src_exists) || !NILP (info_exists)) if (!NILP (lib_src_exists) || !NILP (info_exists))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment