Skip to content

Commit 4ea0631

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 a49d8bd commit 4ea0631

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
@@ -450,6 +450,7 @@ lib = lib
450450
# DESTDIR =
451451
pathsep = :
452452

453+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
453454
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
454455
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
455456
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1616,6 +1617,7 @@ bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
16161617
mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
16171618
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
16181619
localedir_SQ = $(subst ','\'',$(localedir))
1620+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
16191621
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
16201622
template_dir_SQ = $(subst ','\'',$(template_dir))
16211623
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2049,7 +2051,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
20492051

20502052
gettext.sp gettext.s gettext.o: GIT-PREFIX
20512053
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2052-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2054+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
20532055

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

0 commit comments

Comments
 (0)