Skip to content

Commit e9a6dbe

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 adebcb4 commit e9a6dbe

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
@@ -457,6 +457,7 @@ lib = lib
457457
# DESTDIR =
458458
pathsep = :
459459

460+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
460461
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
461462
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
462463
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1636,6 +1637,7 @@ bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
16361637
mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
16371638
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
16381639
localedir_SQ = $(subst ','\'',$(localedir))
1640+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
16391641
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
16401642
template_dir_SQ = $(subst ','\'',$(template_dir))
16411643
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2069,7 +2071,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
20692071

20702072
gettext.sp gettext.s gettext.o: GIT-PREFIX
20712073
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2072-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2074+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
20732075

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

0 commit comments

Comments
 (0)