From a5e899e4c786e2ed7f58874d66956bf196cef8df Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Fri, 5 Dec 2008 18:47:16 +0100 Subject: Makefile: allow cgit.conf to override platform-specific tweaks If the makefile doesn't automatically define the correct build variables it is nice to be able to define them explicitly. Signed-off-by: Lars Hjemli --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index dc98072..2e51c31 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,6 @@ SHA1_HEADER = GIT_VER = 1.6.0.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 -# -# Let the user override the above settings. -# --include cgit.conf - # Define NO_STRCASESTR if you don't have strcasestr. # # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). @@ -32,6 +27,11 @@ ifeq ($(uname_O),Cygwin) NEEDS_LIBICONV = YesPlease endif +# +# Let the user override the above settings. +# +-include cgit.conf + # # Define a way to invoke make in subdirs quietly, shamelessly ripped # from git.git -- cgit 1.4.1-21-gabe81