Junio C Hamano <junkio@xxxxxxx> wrote: > Brian Gernhardt <benji@xxxxxxxxxxxxxxxxxx> writes: > > > Having config.mak included after the platform tweaks ignores NO_FINK > > or NO_DARWIN_PORTS in that file. Simply including the config earlier > > fixes that. > > I vaguely recall that this was brought up before, and the > conclusion was that the include location is correct but the way > darwin bits were done was wrong. I do not recall the details > but does anybody on the list know? I think we just need to move the NO_FINK stuff below the include; like this: diff --git a/Makefile b/Makefile index 164dbcf..748907b 100644 --- a/Makefile +++ b/Makefile @@ -328,18 +333,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 @@ -433,6 +426,21 @@ else endif endif +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. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html