all repos — cgit @ 9ecde6568a9e39c942f4c5585ffa494c5df870e4

a hyperfast web frontend for git written in c 

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>
Lars Hjemli hjemli@gmail.com
Mon, 14 May 2007 23:09:49 +0200
commit

9ecde6568a9e39c942f4c5585ffa494c5df870e4

parent

5b94c96a83f19a0175a8e1699d71080965793cc2

2 files changed, 8 insertions(+), 5 deletions(-)

jump to
M Makefile → Makefile 
@@ -3,8 +3,9 @@
 prefix = /var/www/htdocs/cgit
 
 SHA1_HEADER = <openssl/sha.h>
+CACHE_ROOT = /var/cache/cgit
+CGIT_CONFIG = /etc/cgitrc
 
-CACHE_ROOT = /var/cache/cgit
 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 @@ #
 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
M cgit.c → cgit.c 
@@ -243,7 +243,7 @@ cgit_repolist.length = 0;
 	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);