crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Let makefile override the configfile location

Browse Source 
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>
This commit is contained in:
Lars Hjemli 2007-05-14 23:09:49 +02:00
parent 5b94c96a83
commit 9ecde6568a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -3,8 +3,9 @@ CGIT_VERSION = 0.4
prefix = /var/www/htdocs/cgit prefix = /var/www/htdocs/cgit
SHA1_HEADER = <openssl/sha.h> SHA1_HEADER = <openssl/sha.h>
CACHE_ROOT = /var/cache/cgit CACHE_ROOT = /var/cache/cgit
CGIT_CONFIG = /etc/cgitrc
EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 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 \ 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 \ 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 CFLAGS += -g
endif 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 all: cgit
cgit: cgit.c cgit.h $(OBJECTS) cgit: cgit.c cgit.h $(OBJECTS)
$(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
$(OBJECTS) $(EXTLIBS)
$(OBJECTS): cgit.h git/libgit.a $(OBJECTS): cgit.h git/libgit.a

2
cgit.c
View File

@ -243,7 +243,7 @@ int main(int argc, const char **argv)
cgit_repolist.count = 0; cgit_repolist.count = 0;
cgit_repolist.repos = NULL; 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")) if (getenv("QUERY_STRING"))
cgit_querystring = xstrdup(getenv("QUERY_STRING")); cgit_querystring = xstrdup(getenv("QUERY_STRING"));
cgit_parse_args(argc, argv); cgit_parse_args(argc, argv);