summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-12 17:07:33 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-12 17:07:33 -0800
commitfa2376f3c89ae59f33e50e0e5769dec2652e9568 (patch)
tree77d2d776bf566ac7587529a1f60595eba89db449 /Makefile
parentc93be3b539da06e2d89d613448dfadf83c48de53 (diff)
parent0d7a6e4ef9e2dc458a9a56ab73638d97f4e75d87 (diff)
downloadgit-fa2376f3c89ae59f33e50e0e5769dec2652e9568.tar.gz
Merge branch 'maint'
* maint: Clarify fetch error for missing objects. Move Fink and Ports check to after config file Conflicts: Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile27
1 files changed, 15 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index a1861de2cc..906e984920 100644
--- a/Makefile
+++ b/Makefile
@@ -326,18 +326,6 @@ ifeq ($(uname_S),Darwin)
NEEDS_SSL_WITH_CRYPTO = YesPlease
NEEDS_LIBICONV = YesPlease
NO_STRLCPY = YesPlease
- ifndef NO_FINK
- ifeq ($(shell test -d /sw/lib && echo y),y)
- BASIC_CFLAGS += -I/sw/include
- BASIC_LDFLAGS += -L/sw/lib
- endif
- endif
- ifndef NO_DARWIN_PORTS
- ifeq ($(shell test -d /opt/local/lib && echo y),y)
- BASIC_CFLAGS += -I/opt/local/include
- BASIC_LDFLAGS += -L/opt/local/lib
- endif
- endif
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
@@ -415,6 +403,21 @@ endif
-include config.mak.autogen
-include config.mak
+ifeq ($(uname_S),Darwin)
+ ifndef NO_FINK
+ ifeq ($(shell test -d /sw/lib && echo y),y)
+ BASIC_CFLAGS += -I/sw/include
+ BASIC_LDFLAGS += -L/sw/lib
+ endif
+ endif
+ ifndef NO_DARWIN_PORTS
+ ifeq ($(shell test -d /opt/local/lib && echo y),y)
+ BASIC_CFLAGS += -I/opt/local/include
+ BASIC_LDFLAGS += -L/opt/local/lib
+ endif
+ endif
+endif
+
ifndef NO_CURL
ifdef CURLDIR
# This is still problematic -- gcc does not always want -R.