aboutsummaryrefslogtreecommitdiffstats
path: root/src/callproc.c
diff options
context:
space:
mode:
authorKarl Heuer1994-02-22 23:50:27 +0000
committerKarl Heuer1994-02-22 23:50:27 +0000
commit35a2f4b8cb708de85ef78e24e544ff2fbb4b4588 (patch)
tree97e64544513d76636a6ccfa45758db644fead9b0 /src/callproc.c
parentba87052134065d1f9d4661b41f053db06d21dd5d (diff)
downloademacs-35a2f4b8cb708de85ef78e24e544ff2fbb4b4588.tar.gz
emacs-35a2f4b8cb708de85ef78e24e544ff2fbb4b4588.zip
(syms_of_callproc): New variable Vdoc_directory.
(init_callproc_1): Initialize it.
Diffstat (limited to 'src/callproc.c')
-rw-r--r--src/callproc.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 69f2dc9e3c8..ae10f2f2012 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -75,7 +75,7 @@ extern char **environ;
75Lisp_Object Vbinary_process; 75Lisp_Object Vbinary_process;
76#endif 76#endif
77 77
78Lisp_Object Vexec_path, Vexec_directory, Vdata_directory; 78Lisp_Object Vexec_path, Vexec_directory, Vdata_directory, Vdoc_directory;
79Lisp_Object Vconfigure_info_directory; 79Lisp_Object Vconfigure_info_directory;
80 80
81Lisp_Object Vshell_file_name; 81Lisp_Object Vshell_file_name;
@@ -756,10 +756,14 @@ egetenv (var)
756init_callproc_1 () 756init_callproc_1 ()
757{ 757{
758 char *data_dir = egetenv ("EMACSDATA"); 758 char *data_dir = egetenv ("EMACSDATA");
759 759 char *doc_dir = egetenv ("EMACSDOC");
760
760 Vdata_directory 761 Vdata_directory
761 = Ffile_name_as_directory (build_string (data_dir ? data_dir 762 = Ffile_name_as_directory (build_string (data_dir ? data_dir
762 : PATH_DATA)); 763 : PATH_DATA));
764 Vdoc_directory
765 = Ffile_name_as_directory (build_string (doc_dir ? doc_dir
766 : PATH_DOC));
763 767
764 /* Check the EMACSPATH environment variable, defaulting to the 768 /* Check the EMACSPATH environment variable, defaulting to the
765 PATH_EXEC path from paths.h. */ 769 PATH_EXEC path from paths.h. */
@@ -862,6 +866,10 @@ especially executable programs intended for Emacs to invoke.");
862 "Directory of architecture-independent files that come with GNU Emacs,\n\ 866 "Directory of architecture-independent files that come with GNU Emacs,\n\
863intended for Emacs to use."); 867intended for Emacs to use.");
864 868
869 DEFVAR_LISP ("doc-directory", &Vdoc_directory,
870 "Directory containing the DOC file that comes with GNU Emacs.\n\
871This is usually the same as data-directory.");
872
865 DEFVAR_LISP ("configure-info-directory", &Vconfigure_info_directory, 873 DEFVAR_LISP ("configure-info-directory", &Vconfigure_info_directory,
866 "For internal use by the build procedure only.\n\ 874 "For internal use by the build procedure only.\n\
867This is the name of the directory in which the build procedure installed\n\ 875This is the name of the directory in which the build procedure installed\n\