Web lists-archives.com

Re: [PATCH v3 4/4] exec_cmd: RUNTIME_PREFIX on some POSIX systems




Hi Dan,

On Mon, 27 Nov 2017, Dan Jacques wrote:

> diff --git a/gettext.c b/gettext.c
> index db727ea02..6b64d5c2e 100644
> --- 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);

In Git for Windows, we have an almost identical patch:

	https://github.com/git-for-windows/git/commit/bdd739bb2b0b

We just guard the call to system_path() behind a test whether podir is
already absolute, but these days, system_path() does that itself.

I am too little of a Perl expert to be helpful with the other patches, but
I would gladly runa build & test on Windows if you direct me to an
easily-pullable branch.

Ciao,
Johannes