Skip to content

Commit

Permalink
Support custom build options in config.mak
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Oct 11, 2005
1 parent 0a81552 commit f2d6a25
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit f2d6a25

Please sign in to comment.