Skip to content

Commit d872597

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 68f5458 commit d872597

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
@@ -474,6 +474,7 @@ lib = lib
474474
# DESTDIR =
475475
pathsep = :
476476

477+
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
477478
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
478479
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
479480
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1689,6 +1690,7 @@ bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
16891690
mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
16901691
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
16911692
localedir_SQ = $(subst ','\'',$(localedir))
1693+
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
16921694
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
16931695
template_dir_SQ = $(subst ','\'',$(template_dir))
16941696
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2121,7 +2123,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
21212123

21222124
gettext.sp gettext.s gettext.o: GIT-PREFIX
21232125
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2124-
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
2126+
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
21252127

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

0 commit comments

Comments
 (0)