summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-25 16:41:25 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-25 16:41:25 +0900
commitaa8c8d914e4ae709e4fd025f359594f62653d9e5 (patch)
tree7923aa5b79e2d8c9acd3a310726fde8032151eab
parentMerge branch 'bs/sendemail-tighten-anything-by' (diff)
parentmacOS: make sure that gettext is found (diff)
downloadtgif-aa8c8d914e4ae709e4fd025f359594f62653d9e5.tar.xz
Merge branch 'js/macos-gettext-build'
Build with gettext breaks on recent macOS w/ Homebrew when /usr/local/bin is not on PATH, which has been corrected. * js/macos-gettext-build: macOS: make sure that gettext is found
-rw-r--r--config.mak.uname2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 41e85fab1c..3605fead53 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -114,6 +114,8 @@ ifeq ($(uname_S),Darwin)
HAVE_BSD_SYSCTL = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
+ BASIC_CFLAGS += -I/usr/local/include
+ BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease