global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-23 00:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! gettext: use a GIT_LOCALE_PATH relative to $(prefix)

Browse Source 
In preparation for the more general RUNTIME_PREFIX support, this reverts
commit 8eed480e3f.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-04-19 00:13:29 +02:00
parent 7e4058d72e
commit f91c5f2839
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -492,7 +492,6 @@ lib = lib
# DESTDIR =
pathsep = :
localedir_relative = $(patsubst $(prefix)/%,%,$(localedir))
mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
@@ -1742,7 +1741,6 @@ mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
perllibdir_SQ = $(subst ','\'',$(perllibdir))
localedir_SQ = $(subst ','\'',$(localedir))
localedir_relative_SQ = $(subst ','\'',$(localedir_relative))
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
template_dir_SQ = $(subst ','\'',$(template_dir))
htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
@@ -2166,7 +2164,7 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
gettext.sp gettext.s gettext.o: GIT-PREFIX
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SPARSE_FLAGS += \
-DCURL_DISABLE_TYPECHECK