Re: [PATCH] Move Fink and Ports check to after config file

Brian Gernhardt· Dec 12, 2006, 17:01 UTC · lore

[PATCH] 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>
---
  Makefile |   27 +++++++++++++++------------
  1 files changed, 15 insertions(+), 12 deletions(-)

Show changes to Makefile +15 −13

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

Junio C Hamano· Dec 12, 2006, 22:45 UTC · re: Brian Gernhardt · lore

Brian Gernhardt <benji@silverinsanity.com> writes:

> 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>

First time I saw this today I said "I'd swear I've seen this".

http://thread.gmane.org/gmane.comp.version-control.git/26493/focus=26503

I guess after I asked for a confirmation from you I simply forgot to apply it. Thanks for a reminder.

Brian Gernhardt· Dec 13, 2006, 01:35 UTC · re: Junio C Hamano · lore

On Dec 12, 2006, at 5:45 PM, Junio C Hamano wrote:

> First time I saw this today I said "I'd swear I've seen this".
>
> I guess after I asked for a confirmation from you I simply
> forgot to apply it.  Thanks for a reminder.

'salright. I got so used to "git rebase origin/master" that I forgot that I had brought it up. Oh, well. Discussing the perl/Makefile issue reminded me that I had this sitting in my tree.

patchRe: [PATCH] Move Fink and Ports check to after config file