about summary refs log tree commit diff stats
path: root/Makefile
diff options
context:
space:
mode:
authorLars Hjemli2007-05-14 23:09:49 +0200
committerLars Hjemli2007-05-14 23:09:49 +0200
commit9ecde6568a9e39c942f4c5585ffa494c5df870e4 (patch)
tree52038a9c553102b13741cecd546435b03917374a /Makefile
parentcgit.c: fix whitespace breakage (diff)
downloadcgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.tar.gz
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--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile index a36eede..3d8edb8 100644 --- a/Makefile +++ b/Makefile
@@ -3,8 +3,9 @@ CGIT_VERSION = 0.4
3prefix = /var/www/htdocs/cgit 3prefix = /var/www/htdocs/cgit
4 4
5SHA1_HEADER = <openssl/sha.h> 5SHA1_HEADER = <openssl/sha.h>
6
7CACHE_ROOT = /var/cache/cgit 6CACHE_ROOT = /var/cache/cgit
7CGIT_CONFIG = /etc/cgitrc
8
8EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 9EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
9OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 10OBJECTS = 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
17endif 18endif
18 19
19CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)' 20CFLAGS += -Igit
21CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
22CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
23CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
20 24
21 25
22# 26#
@@ -39,8 +43,7 @@ endif
39all: cgit 43all: cgit
40 44
41cgit: cgit.c cgit.h $(OBJECTS) 45cgit: 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