From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Sun, 6 Nov 2005 12:33:07 +0000 (-0800)
Subject: Use fink/darwinport paths for OSX
X-Git-Tag: v0.99.9e^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0cfddacdcca229deca9a1dcdf8628bf168171908;p=git.git

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>
---

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