summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/callproc.c8
-rw-r--r--src/epaths.in6
2 files changed, 14 insertions, 0 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 2750f9a3f5e..51ba9301cdc 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -65,6 +65,7 @@ extern char **environ;
#define max(a, b) ((a) > (b) ? (a) : (b))
Lisp_Object Vexec_path, Vexec_directory, Vdata_directory;
+Lisp_Object Vconfigure_info_directory;
Lisp_Object Vshell_file_name;
@@ -704,6 +705,13 @@ especially executable programs intended for Emacs to invoke.");
"Directory of architecture-independent files that come with GNU Emacs,\n\
intended for Emacs to use.");
+ DEFVAR_LISP ("configure-info-directory", &Vconfigure_info_directory,
+ "For internal use by the build procedure only.\n\
+This is the name of the directory in which the build procedure installed\n\
+Emacs's info files; the default value for Info-default-directory-list\n\
+includes this.");
+ Vconfigure_info_directory = build_string (PATH_INFO);
+
DEFVAR_LISP ("process-environment", &Vprocess_environment,
"List of environment variables for subprocesses to inherit.\n\
Each element should be a string of the form ENVVARNAME=VALUE.\n\
diff --git a/src/epaths.in b/src/epaths.in
index ed15aca17ac..ce538f0591a 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -27,3 +27,9 @@
should be writable by everyone. THE STRING MUST END WITH A
SLASH!!! */
#define PATH_LOCK "/usr/local/lib/emacs/lock/"
+
+/* Where the configuration process believes the info tree lives. The
+ lisp variable configure-info-directory gets its value from this
+ macro, and is then used to set the Info-default-directory-list. */
+#define PATH_INFO "/usr/local/info"
+