Skip to content

Commit 8eed480

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 5ff388f commit 8eed480

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
@@ -492,6 +492,7 @@ lib = lib
492492
# DESTDIR =
493493
pathsep = :
494494

495+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
495496
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
496497
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
497498
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1740,6 +1741,7 @@ mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
17401741
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
17411742
perllibdir_SQ = $(subst ','\'',$(perllibdir))
17421743
localedir_SQ = $(subst ','\'',$(localedir))
1744+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
17431745
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
17441746
template_dir_SQ = $(subst ','\'',$(template_dir))
17451747
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2163,7 +2165,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
21632165

21642166
gettext.sp gettext.s gettext.o: GIT-PREFIX
21652167
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2166-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2168+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
21672169

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

0 commit comments

Comments
 (0)