@matheusbsbs / matheus-bagliano / commits / 59f8674006
Fork 0

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>

Brian Gernhardt committed Dec 12, 2006 at 12:01 UTC 59f867400650b39568e4a7f96bd60f3a0072dbda
1 file changed +15 -12
Makefile
+15 -12
@@ -334,18 +334,6 @@ ifeq ($(uname_S),Darwin)
334 NEEDS_SSL_WITH_CRYPTO = YesPlease
335 NEEDS_LIBICONV = YesPlease
336 NO_STRLCPY = YesPlease
337 - ifndef NO_FINK
338 - ifeq ($(shell test -d /sw/lib && echo y),y)
339 - BASIC_CFLAGS += -I/sw/include
340 - BASIC_LDFLAGS += -L/sw/lib
341 - endif
342 - endif
343 - ifndef NO_DARWIN_PORTS
344 - ifeq ($(shell test -d /opt/local/lib && echo y),y)
345 - BASIC_CFLAGS += -I/opt/local/include
346 - BASIC_LDFLAGS += -L/opt/local/lib
347 - endif
348 - endif
337 endif
338 ifeq ($(uname_S),SunOS)
339 NEEDS_SOCKET = YesPlease
@@ -423,6 +411,21 @@ endif
411 -include config.mak.autogen
412 -include config.mak
413
414 +ifeq ($(uname_S),Darwin)
415 + ifndef NO_FINK
416 + ifeq ($(shell test -d /sw/lib && echo y),y)
417 + BASIC_CFLAGS += -I/sw/include
418 + BASIC_LDFLAGS += -L/sw/lib
419 + endif
420 + endif
421 + ifndef NO_DARWIN_PORTS
422 + ifeq ($(shell test -d /opt/local/lib && echo y),y)
423 + BASIC_CFLAGS += -I/opt/local/include
424 + BASIC_LDFLAGS += -L/opt/local/lib
425 + endif
426 + endif
427 +endif
428 +
429 ifdef WITH_OWN_SUBPROCESS_PY
430 PYMODULES += compat/subprocess.py
431 else