void
init_callproc_1 (void)
{
- char *data_dir = egetenv ("EMACSDATA");
- char *doc_dir = egetenv ("EMACSDOC");
#ifdef HAVE_NS
const char *etc_dir = ns_etc_directory ();
const char *path_exec = ns_exec_path ();
#endif
- Vdata_directory
- = Ffile_name_as_directory (build_string (data_dir ? data_dir
+ Vdata_directory = decode_env_path ("EMACSDATA",
#ifdef HAVE_NS
- : (etc_dir ? etc_dir : PATH_DATA)
-#else
- : PATH_DATA
+ etc_dir ? etc_dir :
#endif
- ));
- Vdoc_directory
- = Ffile_name_as_directory (build_string (doc_dir ? doc_dir
+ PATH_DATA);
+ Vdata_directory = Ffile_name_as_directory (Fcar (Vdata_directory));
+
+ Vdoc_directory = decode_env_path ("EMACSDOC",
#ifdef HAVE_NS
- : (etc_dir ? etc_dir : PATH_DOC)
-#else
- : PATH_DOC
+ etc_dir ? etc_dir :
#endif
- ));
+ PATH_DOC);
+ Vdoc_directory = Ffile_name_as_directory (Fcar (Vdoc_directory));
/* Check the EMACSPATH environment variable, defaulting to the
PATH_EXEC path from epaths.h. */
Lisp_Object tem;
tem = Fexpand_file_name (build_string ("lib-src"),
Vinstallation_directory);
-#ifndef DOS_NT
+#ifndef MSDOS
/* MSDOS uses wrapped binaries, so don't do this. */
if (NILP (Fmember (tem, Vexec_path)))
{
}
Vexec_directory = Ffile_name_as_directory (tem);
-#endif /* not DOS_NT */
+#endif /* not MSDOS */
/* Maybe use ../etc as well as ../lib-src. */
if (data_dir == 0)