diff options
| author | Glenn Morris | 2015-04-20 17:38:36 -0400 |
|---|---|---|
| committer | Glenn Morris | 2015-04-20 17:38:36 -0400 |
| commit | cf2e9971ea12fb7bfa7700a9693d32ca30f87118 (patch) | |
| tree | 51d4fd34785959af8c24791ba24003d423527209 | |
| parent | b7a015f5e02281cc8500154ebe4339a18587b415 (diff) | |
| download | emacs-cf2e9971ea12fb7bfa7700a9693d32ca30f87118.tar.gz emacs-cf2e9971ea12fb7bfa7700a9693d32ca30f87118.zip | |
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.c | 4 |
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) | |||
| 1595 | #ifdef HAVE_NS | 1595 | #ifdef HAVE_NS |
| 1596 | const char *path_exec = ns_exec_path (); | 1596 | const char *path_exec = ns_exec_path (); |
| 1597 | #endif | 1597 | #endif |
| 1598 | /* Running uninstalled, so default to tem rather than PATH_EXEC. */ | ||
| 1598 | Vexec_path = decode_env_path ("EMACSPATH", | 1599 | Vexec_path = decode_env_path ("EMACSPATH", |
| 1599 | #ifdef HAVE_NS | 1600 | #ifdef HAVE_NS |
| 1600 | path_exec ? path_exec : | 1601 | path_exec ? path_exec : |
| 1601 | #endif | 1602 | #endif |
| 1602 | PATH_EXEC, 0); | 1603 | SSDATA (tem), 0); |
| 1603 | Vexec_path = Fcons (tem, Vexec_path); | ||
| 1604 | Vexec_path = nconc2 (decode_env_path ("PATH", "", 0), Vexec_path); | 1604 | Vexec_path = nconc2 (decode_env_path ("PATH", "", 0), Vexec_path); |
| 1605 | } | 1605 | } |
| 1606 | 1606 | ||