From: Brian Gernhardt <benji@silverinsanity.com>
Date: Tue, 05 Sep 2006 22:00:46 GMT
Subject: [PATCH] Include local config before platform tweaks
Message-ID: <9434EEBD-57BE-46D7-A2FF-069BB960AA44@silverinsanity.com>

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.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
---
Makefile |    6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7b3114f..81902d4 100644
--- a/Makefile
+++ b/Makefile
@@ -300,6 +300,9 @@ BUILTIN_OBJS = \
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
LIBS = $(GITLIBS) -lz
+-include config.mak.autogen
+-include config.mak
+
#
# Platform specific tweaks
#
@@ -403,9 +406,6 @@ ifneq (,$(findstring arm,$(uname_M)))
	ARM_SHA1 = YesPlease
endif
--include config.mak.autogen
--include config.mak
-
ifdef WITH_OWN_SUBPROCESS_PY
	PYMODULES += compat/subprocess.py
else