cgit

commit ad3b39d3b8443e142a6bfee34d527c99cd5f280d

Author: Lars Hjemli <hjemli@gmail.com>

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>

 Makefile | 5 +++++


diff --git a/Makefile b/Makefile
index aa7146da93da2592c7d3f69675b4eb49eae3ae7c..914db1c0b43b8f178d80727932f809c4c987f499 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 \