summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-04-20 17:38:36 -0400
committerGlenn Morris <rgm@gnu.org>2015-04-20 17:38:36 -0400
commitcf2e9971ea12fb7bfa7700a9693d32ca30f87118 (patch)
tree51d4fd34785959af8c24791ba24003d423527209
parentb7a015f5e02281cc8500154ebe4339a18587b415 (diff)
Tweak exec-path in uninstalled case
* src/callproc.c (init_callproc): If running uninstalled, do not include eventual installation libexec directory in exec-path.
-rw-r--r--src/callproc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c
index e1fe8ed95df..12c81439fe4 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1595,12 +1595,12 @@ init_callproc (void)
#ifdef HAVE_NS
const char *path_exec = ns_exec_path ();
#endif
+ /* Running uninstalled, so default to tem rather than PATH_EXEC. */
Vexec_path = decode_env_path ("EMACSPATH",
#ifdef HAVE_NS
path_exec ? path_exec :
#endif
- PATH_EXEC, 0);
- Vexec_path = Fcons (tem, Vexec_path);
+ SSDATA (tem), 0);
Vexec_path = nconc2 (decode_env_path ("PATH", "", 0), Vexec_path);
}