summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-05-14 21:09:49 +0000
committerLars Hjemli <hjemli@gmail.com>2007-05-14 21:09:49 +0000
commit9ecde6568a9e39c942f4c5585ffa494c5df870e4 (patch)
tree52038a9c553102b13741cecd546435b03917374a
parent5b94c96a83f19a0175a8e1699d71080965793cc2 (diff)
downloadcgit-9ecde6568a9e39c942f4c5585ffa494c5df870e4.tar
cgit-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>
-rw-r--r--Makefile11
-rw-r--r--cgit.c2
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a36eede..3d8edb8 100644
--- a/Makefile
+++ b/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
diff --git a/cgit.c b/cgit.c
index 1d7a83f..67ad103 100644
--- a/cgit.c
+++ b/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);