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>
Этот коммит содержится в:
родитель
5b94c96a83
Коммит
9ecde6568a
11
Makefile
11
Makefile
@ -3,8 +3,9 @@ CGIT_VERSION = 0.4
|
||||
prefix = /var/www/htdocs/cgit
|
||||
|
||||
SHA1_HEADER = <openssl/sha.h>
|
||||
|
||||
CACHE_ROOT = /var/cache/cgit
|
||||
CGIT_CONFIG = /etc/cgitrc
|
||||
|
||||
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 \
|
||||
@ -16,7 +17,10 @@ ifdef DEBUG
|
||||
CFLAGS += -g
|
||||
endif
|
||||
|
||||
CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
|
||||
CFLAGS += -Igit
|
||||
CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
|
||||
CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
|
||||
CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
|
||||
|
||||
|
||||
#
|
||||
@ -39,8 +43,7 @@ endif
|
||||
all: cgit
|
||||
|
||||
cgit: cgit.c cgit.h $(OBJECTS)
|
||||
$(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
|
||||
$(OBJECTS) $(EXTLIBS)
|
||||
$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
|
||||
|
||||
$(OBJECTS): cgit.h git/libgit.a
|
||||
|
||||
|
2
cgit.c
2
cgit.c
@ -243,7 +243,7 @@ int main(int argc, const char **argv)
|
||||
cgit_repolist.count = 0;
|
||||
cgit_repolist.repos = NULL;
|
||||
|
||||
cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
|
||||
cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
|
||||
if (getenv("QUERY_STRING"))
|
||||
cgit_querystring = xstrdup(getenv("QUERY_STRING"));
|
||||
cgit_parse_args(argc, argv);
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user