diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-02-04 23:57:34 +0100 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-02-05 00:12:04 +0100 |
| commit | c52e84135e6272d008f69a9ac00265875ff4e60e (patch) | |
| tree | 74cb0a76ea7b69f152766cb5510c6f60a7caf2a1 /Makefile | |
| parent | Update cgitrc template (diff) | |
| download | cgit-pink-c52e84135e6272d008f69a9ac00265875ff4e60e.tar.gz cgit-pink-c52e84135e6272d008f69a9ac00265875ff4e60e.zip | |
Add support for prefix and gitsrc arguments to 'make'
This should improve the installation a little, especially since the new options are mentioned in the README. Also, add a make-rule to build the git binaries if necessary + a dependency between cgit and libgit.a. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile b/Makefile index 72a1cff..e863205 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ CGIT_VERSION = 0.1 -INSTALL_DIR = /var/www/htdocs/cgit -CACHE_ROOT = /var/cache/cgit +prefix = /var/www/htdocs/cgit +gitsrc = ../git -EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto +CACHE_ROOT = /var/cache/cgit +EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/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.c ui-tree.c ui-commit.c ui-diff.o @@ -16,10 +17,11 @@ endif all: cgit install: all clean-cache - install cgit $(INSTALL_DIR)/cgit.cgi - install cgit.css $(INSTALL_DIR)/cgit.css + mkdir -p $(prefix) + install cgit $(prefix)/cgit.cgi + install cgit.css $(prefix)/cgit.css -cgit: cgit.c cgit.h git.h $(OBJECTS) +cgit: cgit.c cgit.h git.h $(OBJECTS) $(gitsrc)/libgit.a $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ $(OBJECTS) $(EXTLIBS) @@ -27,6 +29,10 @@ $(OBJECTS): cgit.h git.h ui-diff.o: xdiff.h +$(gitsrc)/libgit.a: + $(MAKE) -C $(gitsrc) + + .PHONY: clean clean: rm -f cgit *.o |