summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-15 16:38:31 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-15 16:41:31 (UTC)
commitad3b39d3b8443e142a6bfee34d527c99cd5f280d (patch) (unidiff)
treeac90d617f9468840472a45d33b892ecb90203013
parentc94afaacf4f996e3c983bcc150a2bacde2b00f20 (diff)
downloadcgit-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.zip
cgit-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.tar.gz
cgit-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.tar.bz2
Include cgit.conf in Makefile
This allows persistent overrides of Makefile settings without touching the Makefile. Suggested in a patch by Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index aa7146d..914db1c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,11 @@ CACHE_ROOT = /var/cache/cgit
7CGIT_CONFIG = /etc/cgitrc 7CGIT_CONFIG = /etc/cgitrc
8CGIT_SCRIPT_NAME = cgit.cgi 8CGIT_SCRIPT_NAME = cgit.cgi
9 9
10#
11# Let the user override the above settings.
12#
13-include cgit.conf
14
10EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 15EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
11OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 16OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
12 ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ 17 ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \