summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0a81552)
raw | patch | inline | side by side (parent: 0a81552)
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Tue, 11 Oct 2005 22:22:47 +0000 (15:22 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 11 Oct 2005 22:22:47 +0000 (15:22 -0700) |
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>
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>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index c31af7b3c3bce6ea824e93ae651affe73099af5c..8697d52de727dc1882c62e1edcbc68fc0cc52302 100644 (file)
--- a/Makefile
+++ b/Makefile
ARM_SHA1 = YesPlease
endif
+-include config.mak
+
ifndef NO_CURL
ifdef CURLDIR
# This is still problematic -- gcc does not want -R.