1 file changed, 5 insertions, 0 deletions

diff --git a/Makefile b/Makefileindex aa7146da..914db1c0 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 \
diff --git a/Makefile b/Makefile
index aa7146da..914db1c0 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 \