Merge branch 'dj/runtime-prefix'

[thirdparty/git.git] / gettext.c

diff --git a/gettext.c b/gettext.c
index db727ea0204aa13acea0f189ea03e59b5cdb918f..baba28343c311594e048d62e190ded09e49ed5b0 100644 (file)
--- a/gettext.c
+++ b/gettext.c
@@ -2,7 +2,8 @@
  * Copyright (c) 2010 Ævar Arnfjörð Bjarmason
  */
 
-#include "git-compat-util.h"
+#include "cache.h"
+#include "exec-cmd.h"
 #include "gettext.h"
 #include "strbuf.h"
 #include "utf8.h"
@@ -157,10 +158,11 @@ static void init_gettext_charset(const char *domain)
 
 void git_setup_gettext(void)
 {
-       const char *podir = getenv("GIT_TEXTDOMAINDIR");
+       const char *podir = getenv(GIT_TEXT_DOMAIN_DIR_ENVIRONMENT);
 
        if (!podir)
-               podir = GIT_LOCALE_PATH;
+               podir = system_path(GIT_LOCALE_PATH);
+
        bindtextdomain("git", podir);
        setlocale(LC_MESSAGES, "");
        setlocale(LC_TIME, "");