Skip to content

Commit fce5fb8

Browse files
committed
gettext: use a GIT_LOCALE_PATH relative to $(prefix)
On Windows, we simply pass a POSIX path to bindtextdomain(), relying on the current libintl-8.dll implementation to handle that gracefully by resolving the path relative to the "root" directory inferred from the location of the .dll file itself. However, not only does this rely on the custom patches of the gettext library as shipped with MSYS2 (gettext's own source code is not prepared to handle POSIX paths on Windows), it also means that Git itself cannot use the `podir` variable at all because it does not handle absolute POSIX paths in system_path() correctly, leaving them as-is. This patch fixes that behavior by always using a GIT_LOCALE_PATH relative to the (runtime) prefix. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent dac3554 commit fce5fb8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ lib = lib
482482
# DESTDIR =
483483
pathsep = :
484484

485+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
485486
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
486487
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
487488
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1719,6 +1720,7 @@ bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
17191720
mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
17201721
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
17211722
localedir_SQ = $(subst ','\'',$(localedir))
1723+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
17221724
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
17231725
template_dir_SQ = $(subst ','\'',$(template_dir))
17241726
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2151,7 +2153,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
21512153

21522154
gettext.sp gettext.s gettext.o: GIT-PREFIX
21532155
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2154-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2156+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
21552157

21562158
http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SPARSE_FLAGS += \
21572159
-DCURL_DISABLE_TYPECHECK

0 commit comments

Comments
 (0)