aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRandal L. Schwartz <merlyn@stonehenge.com>2005-11-06 04:33:07 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-06 10:52:48 -0800
commit0cfddacdcca229deca9a1dcdf8628bf168171908 (patch)
treef571975209b0bc38ca099684f9731efe4163b396 /Makefile
parentbb73d73c0885fce357e0d70aa51c2215a8e38a4e (diff)
downloadgit-0cfddacdcca229deca9a1dcdf8628bf168171908.tar.gz
git-0cfddacdcca229deca9a1dcdf8628bf168171908.tar.xz
Use fink/darwinport paths for OSX
There's no standard libexpat for OSX, so if you install it after-market, it can end up in various directories. Give paths used by fink and darwinports by default to CFLAGS. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6f9b0d185..f89e0bd29 100644
--- a/Makefile
+++ b/Makefile
@@ -185,6 +185,10 @@ uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
ifeq ($(uname_S),Darwin)
NEEDS_SSL_WITH_CRYPTO = YesPlease
NEEDS_LIBICONV = YesPlease
+ ## fink
+ ALL_CFLAGS += -I/sw/include -L/sw/lib
+ ## darwinports
+ ALL_CFLAGS += -I/opt/local/include -L/opt/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease