From f91c5f28393f441c389dad776954b0263de279b8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 19 Apr 2018 00:13:29 +0200 Subject: [PATCH] fixup! gettext: use a GIT_LOCALE_PATH relative to $(prefix) In preparation for the more general RUNTIME_PREFIX support, this reverts commit 8eed480e3ff0630c61e3c04424a39e365cd6c014. Signed-off-by: Johannes Schindelin --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6db6639e18..9b4bc04ec7 100644 --- a/Makefile +++ b/Makefile @@ -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