diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2006-12-12 12:01:47 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-12 14:48:25 -0800 |
| commit | 59f867400650b39568e4a7f96bd60f3a0072dbda (patch) | |
| tree | 512c77c68622dc2b2a1d9328da58a23f8af53fa2 | |
| parent | 9abd46a3471c2d58976e06a00e937b03672b98bc (diff) | |
| download | git-59f867400650b39568e4a7f96bd60f3a0072dbda.tar.gz git-59f867400650b39568e4a7f96bd60f3a0072dbda.tar.xz | |
Move Fink and Ports check to after config file
Putting NO_FINK or NO_DARWIN_PORTS in config.mak is ignored because the
checks are done before the config is included.
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -334,18 +334,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 @@ -423,6 +411,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 + ifdef WITH_OWN_SUBPROCESS_PY PYMODULES += compat/subprocess.py else |