Skip to content

Commit a24a570

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 a3dd719 commit a24a570

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
@@ -452,6 +452,7 @@ lib = lib
452452
# DESTDIR =
453453
pathsep = :
454454

455+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
455456
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
456457
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
457458
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1627,6 +1628,7 @@ bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
16271628
mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
16281629
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
16291630
localedir_SQ = $(subst ','\'',$(localedir))
1631+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
16301632
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
16311633
template_dir_SQ = $(subst ','\'',$(template_dir))
16321634
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2060,7 +2062,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
20602062

20612063
gettext.sp gettext.s gettext.o: GIT-PREFIX
20622064
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2063-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2065+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
20642066

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

0 commit comments

Comments
 (0)