Skip to content

Commit f91c5f2

Browse files
committed
fixup! gettext: use a GIT_LOCALE_PATH relative to $(prefix)
In preparation for the more general RUNTIME_PREFIX support, this reverts commit 8eed480. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 7e4058d commit f91c5f2

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@ lib = lib
492492
# DESTDIR =
493493
pathsep = :
494494

495-
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
496495
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
497496
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
498497
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1742,7 +1741,6 @@ mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
17421741
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
17431742
perllibdir_SQ = $(subst ','\'',$(perllibdir))
17441743
localedir_SQ = $(subst ','\'',$(localedir))
1745-
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
17461744
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
17471745
template_dir_SQ = $(subst ','\'',$(template_dir))
17481746
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2166,7 +2164,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
21662164

21672165
gettext.sp gettext.s gettext.o: GIT-PREFIX
21682166
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
2169-
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
2167+
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
21702168

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

0 commit comments

Comments
 (0)