summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-12-05 17:47:16 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-05 17:47:16 (UTC)
commita5e899e4c786e2ed7f58874d66956bf196cef8df (patch) (unidiff)
tree278552e943702f74a8c696fb11d91bc94cf6307b
parent97fdac1608a0b4b07aae26b144c6ee7991e6c5eb (diff)
downloadcgit-a5e899e4c786e2ed7f58874d66956bf196cef8df.zip
cgit-a5e899e4c786e2ed7f58874d66956bf196cef8df.tar.gz
cgit-a5e899e4c786e2ed7f58874d66956bf196cef8df.tar.bz2
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 <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile10
1 files 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 = <openssl/sha.h>
7GIT_VER = 1.6.0.3 7GIT_VER = 1.6.0.3
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10#
11# Let the user override the above settings.
12#
13-include cgit.conf
14
15# Define NO_STRCASESTR if you don't have strcasestr. 10# Define NO_STRCASESTR if you don't have strcasestr.
16# 11#
17# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). 12# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
@@ -33,6 +28,11 @@ ifeq ($(uname_O),Cygwin)
33endif 28endif
34 29
35# 30#
31# Let the user override the above settings.
32#
33-include cgit.conf
34
35#
36# Define a way to invoke make in subdirs quietly, shamelessly ripped 36# Define a way to invoke make in subdirs quietly, shamelessly ripped
37# from git.git 37# from git.git
38# 38#