diff options
author | Lars Hjemli | 2007-05-14 23:09:49 +0200 |
---|---|---|
committer | Lars Hjemli | 2007-05-14 23:09:49 +0200 |
commit | 9ecde6568a9e39c942f4c5585ffa494c5df870e4 (patch) | |
tree | 52038a9c553102b13741cecd546435b03917374a /Makefile | |
parent | 5b94c96a83f19a0175a8e1699d71080965793cc2 (diff) | |
download | cgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.tar.gz cgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.tar.bz2 cgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.zip |
Let makefile override the configfile location
Pass CGIT_CONFIG from makefile during build, to enable stuff like
make CGIT_CONFIG=/var/cgit/cgit.conf
Noticed by Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -3,8 +3,9 @@ CGIT_VERSION = 0.4 | |||
3 | prefix = /var/www/htdocs/cgit | 3 | prefix = /var/www/htdocs/cgit |
4 | 4 | ||
5 | SHA1_HEADER = <openssl/sha.h> | 5 | SHA1_HEADER = <openssl/sha.h> |
6 | |||
7 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | CGIT_CONFIG = /etc/cgitrc | ||
8 | |||
8 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 9 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
9 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 10 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ |
10 | ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ | 11 | ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ |
@@ -16,7 +17,10 @@ ifdef DEBUG | |||
16 | CFLAGS += -g | 17 | CFLAGS += -g |
17 | endif | 18 | endif |
18 | 19 | ||
19 | CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)' | 20 | CFLAGS += -Igit |
21 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | ||
22 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | ||
23 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | ||
20 | 24 | ||
21 | 25 | ||
22 | # | 26 | # |
@@ -39,8 +43,7 @@ endif | |||
39 | all: cgit | 43 | all: cgit |
40 | 44 | ||
41 | cgit: cgit.c cgit.h $(OBJECTS) | 45 | cgit: cgit.c cgit.h $(OBJECTS) |
42 | $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ | 46 | $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) |
43 | $(OBJECTS) $(EXTLIBS) | ||
44 | 47 | ||
45 | $(OBJECTS): cgit.h git/libgit.a | 48 | $(OBJECTS): cgit.h git/libgit.a |
46 | 49 | ||