[PATCH] Move Fink and Ports check to after config file
- From
Brian Gernhardt <benji@silverinsanity.com>
- Date
- Dec 12, 2006, 17:01 UTC
- Message-ID
- <AF891711-02C9-414F-98CC-BC53DD24EDB3@silverinsanity.com>
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> --- Makefile | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile index a1861de..c1f1135 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) + ALL_CFLAGS += -I/sw/include + ALL_LDFLAGS += -L/sw/lib + endif + endif + ifndef NO_DARWIN_PORTS + ifeq ($(shell test -d /opt/local/lib && echo y),y) + ALL_CFLAGS += -I/opt/local/include + ALL_LDFLAGS += -L/opt/local/lib + endif + endif +endif + ifndef NO_CURL ifdef CURLDIR # This is still problematic -- gcc does not always want -R. -- 1.4.4.1.GIT