Skip to content

Commit d2d811c

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 44ae284 commit d2d811c

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
@@ -443,6 +443,7 @@ lib = lib
443443
# DESTDIR =
444444
pathsep = :
445445

446+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
446447
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
447448
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
448449
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1596,6 +1597,7 @@ bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
15961597
mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
15971598
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
15981599
localedir_SQ = $(subst ','\'',$(localedir))
1600+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
15991601
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
16001602
template_dir_SQ = $(subst ','\'',$(template_dir))
16011603
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2029,7 +2031,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
20292031

20302032
gettext.sp gettext.s gettext.o: GIT-PREFIX
20312033
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2032-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2034+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
20332035

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

0 commit comments

Comments
 (0)