about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-05-15 18:38:31 +0200
committerLars Hjemli <hjemli@gmail.com>2007-05-15 18:41:31 +0200
commitad3b39d3b8443e142a6bfee34d527c99cd5f280d (patch)
treeac90d617f9468840472a45d33b892ecb90203013 /Makefile
parentui-diff: show /dev/null as filename for add/delete (diff)
downloadcgit-pink-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.tar.gz
cgit-pink-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.zip
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 (limited to 'Makefile')
-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
 CGIT_CONFIG = /etc/cgitrc
 CGIT_SCRIPT_NAME = cgit.cgi
 
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
+
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
 	ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \