diff options
| author | Lars Hjemli | 2007-05-15 18:38:31 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2007-05-15 18:41:31 +0200 |
| commit | ad3b39d3b8443e142a6bfee34d527c99cd5f280d (patch) | |
| tree | ac90d617f9468840472a45d33b892ecb90203013 /Makefile | |
| parent | ui-diff: show /dev/null as filename for add/delete (diff) | |
| download | cgit-ad3b39d3b8443e142a6bfee34d527c99cd5f280d.tar.gz 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 'Makefile')
| -rw-r--r-- | Makefile | 5 |
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 | |||
| 7 | CGIT_CONFIG = /etc/cgitrc | 7 | CGIT_CONFIG = /etc/cgitrc |
| 8 | CGIT_SCRIPT_NAME = cgit.cgi | 8 | CGIT_SCRIPT_NAME = cgit.cgi |
| 9 | 9 | ||
| 10 | # | ||
| 11 | # Let the user override the above settings. | ||
| 12 | # | ||
| 13 | -include cgit.conf | ||
| 14 | |||
| 10 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 15 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
| 11 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 16 | OBJECTS = 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 \ |