From 9ecde6568a9e39c942f4c5585ffa494c5df870e4 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 14 May 2007 23:09:49 +0200 Subject: Let makefile override the configfile location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pass CGIT_CONFIG from makefile during build, to enable stuff like make CGIT_CONFIG=/var/cgit/cgit.conf Noticed by Kristian Høgsberg Signed-off-by: Lars Hjemli --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Makefile') 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 = - 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 -- cgit v1.2.3-59-g8ed1b