diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 08:59:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 08:59:34 +0200 |
| commit | 71c848bb28a2fcef918178f286f7e43d9804588d (patch) | |
| tree | 3dce8d79ffa6e3cd81d9076afb59d9b3a878c93c /exec-cmd.c | |
| parent | Merge branch 'js/colored-push-errors' (diff) | |
| parent | Avoid multiple PREFIX definitions (diff) | |
| download | git-71c848bb28a2fcef918178f286f7e43d9804588d.tar.xz git-71c848bb28a2fcef918178f286f7e43d9804588d.zip | |
Merge branch 'js/runtime-prefix'
* js/runtime-prefix:
Avoid multiple PREFIX definitions
git_setup_gettext: plug memory leak
gettext: avoid initialization if the locale dir is not present
Diffstat (limited to 'exec-cmd.c')
| -rw-r--r-- | exec-cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/exec-cmd.c b/exec-cmd.c index 3b0a039083..02d31ee897 100644 --- a/exec-cmd.c +++ b/exec-cmd.c @@ -48,7 +48,7 @@ static const char *system_prefix(void) !(prefix = strip_path_suffix(executable_dirname, GIT_EXEC_PATH)) && !(prefix = strip_path_suffix(executable_dirname, BINDIR)) && !(prefix = strip_path_suffix(executable_dirname, "git"))) { - prefix = PREFIX; + prefix = FALLBACK_RUNTIME_PREFIX; trace_printf("RUNTIME_PREFIX requested, " "but prefix computation failed. " "Using static fallback '%s'.\n", prefix); @@ -243,7 +243,7 @@ void git_resolve_executable_dir(const char *argv0) */ static const char *system_prefix(void) { - return PREFIX; + return FALLBACK_RUNTIME_PREFIX; } /* |