Skip to content

Commit 376fa12

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 c2f84e5 commit 376fa12

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
@@ -465,6 +465,7 @@ lib = lib
465465
# DESTDIR =
466466
pathsep = :
467467

468+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
468469
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
469470
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
470471
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1663,6 +1664,7 @@ bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
16631664
mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
16641665
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
16651666
localedir_SQ = $(subst ','\'',$(localedir))
1667+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
16661668
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
16671669
template_dir_SQ = $(subst ','\'',$(template_dir))
16681670
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2096,7 +2098,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
20962098

20972099
gettext.sp gettext.s gettext.o: GIT-PREFIX
20982100
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2099-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2101+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
21002102

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

0 commit comments

Comments
 (0)