Merge branch 'jk/config-blob-sans-repo'

diff --git a/exec-cmd.c b/exec-cmd.c
index 3b0a039083a8d377325983272e4aa38ee1b5674c..02d31ee89711da7a4d5a483c6339909c05a15e08 100644 (file)
--- 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;
 }
 
 /*