summaryrefslogtreecommitdiff
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
parentc94afaacf4f996e3c983bcc150a2bacde2b00f20 (diff)
downloadcgit-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.tar.gz
cgit-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.tar.bz2
cgit-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 '')
-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 \
gsubject'>added ebuild window for Qt-Frontendnecoro4-2/+229 2007-04-16added preferences for Qt-Frontendnecoro9-279/+710 2007-04-13Improved masking display and made most of the Qt-Frontend worknecoro7-35/+334 2007-04-10Some more functionality for the Qt-Frontend (complete emerge)necoro8-217/+347 2007-04-07Some more functionality for the Qt-Frontendnecoro11-88/+463 2007-04-07Added Qt-Terminalnecoro4-4/+213 2007-04-06First qt draftnecoro6-1/+796 2007-04-04showed masked packages unmasked by the user similar to stable marked testing ↵necoro5-13/+40 packages 2007-03-31changed changelognecoro1-1/+2 2007-03-31Some small changes for etcproposals 1.1necoro1-2/+2 2007-03-31Some small changes for etcproposals 1.1necoro2-3/+3 2007-03-31Some small changes for etcproposals 1.1necoro1-6/+13 2007-03-31Allowed Plugins to have a menunecoro7-201/+315 2007-03-15Added etc-proposals pluginnecoro7-28/+121 2007-03-10Added USE_EXPAND-supportnecoro5-11/+63 2007-03-10Added plugin-data to about-dialognecoro3-197/+264