From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Tue, 11 Oct 2005 22:22:47 +0000 (-0700)
Subject: Support custom build options in config.mak
X-Git-Tag: v0.99.9~151
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2d6a256272b71f4509e4501a86a0f6c46ee65ad;p=git.git

Support custom build options in config.mak

With this patch, it is possible to store configuration options like
NO_CURL=YesPlease or NO_OPENSSL=YesPlease into a file named
config.mak, which will be included in the Makefile.

[jc: redone with suggestion from Daniel Barkalow to just use -include]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index c31af7b3c..8697d52de 100644
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,8 @@ ifneq (,$(findstring arm,$(uname_M)))
 	ARM_SHA1 = YesPlease
 endif
 
+-include config.mak
+
 ifndef NO_CURL
 	ifdef CURLDIR
 		# This is still problematic -- gcc does not want -R.