summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-10-11 22:22:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-11 22:22:47 (GMT)
commitf2d6a256272b71f4509e4501a86a0f6c46ee65ad (patch)
treea6bf4d142c616a25cf3fbcc3953e6b6c7f7da84e
parent0a81552e06037a57eeb1f784564a3ac092f60dfb (diff)
downloadgit-f2d6a256272b71f4509e4501a86a0f6c46ee65ad.zip
git-f2d6a256272b71f4509e4501a86a0f6c46ee65ad.tar.gz
git-f2d6a256272b71f4509e4501a86a0f6c46ee65ad.tar.bz2
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>
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c31af7b..8697d52 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.