summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-07-02 00:29:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-07-03 19:30:05 (UTC)
commit71ebcbe23ab548e5c0ad40aa8be5741654ed3201 (patch) (unidiff)
treec3f4e7b5aaf6c47713a64a1d01e7330ec3397754
parent51f6547879e2516b9850b0b3c51df044c16a8a52 (diff)
downloadcgit-71ebcbe23ab548e5c0ad40aa8be5741654ed3201.zip
cgit-71ebcbe23ab548e5c0ad40aa8be5741654ed3201.tar.gz
cgit-71ebcbe23ab548e5c0ad40aa8be5741654ed3201.tar.bz2
make gen-version.sh run even if . is not in PATH
Signed-off-by: Michael Krelin <hacker@klever.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e69ad7e..cea09f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,94 +1,94 @@
1prefix = /var/www/htdocs/cgit 1prefix = /var/www/htdocs/cgit
2SHA1_HEADER = <openssl/sha.h> 2SHA1_HEADER = <openssl/sha.h>
3CACHE_ROOT = /var/cache/cgit 3CACHE_ROOT = /var/cache/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CGIT_SCRIPT_NAME = cgit.cgi 5CGIT_SCRIPT_NAME = cgit.cgi
6 6
7# 7#
8# Let the user override the above settings. 8# Let the user override the above settings.
9# 9#
10-include cgit.conf 10-include cgit.conf
11 11
12 12
13CGIT_VERSION = 0.5 13CGIT_VERSION = 0.5
14 14
15all: cgit 15all: cgit
16 16
17VERSION: 17VERSION:
18 gen-version.sh 18 sh gen-version.sh
19 19
20-include VERSION 20-include VERSION
21 21
22 22
23EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 23EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
24OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 24OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
25 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ 25 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
26 ui-snapshot.o ui-blob.o 26 ui-snapshot.o ui-blob.o
27 27
28CFLAGS += -Wall 28CFLAGS += -Wall
29 29
30ifdef DEBUG 30ifdef DEBUG
31 CFLAGS += -g 31 CFLAGS += -g
32endif 32endif
33 33
34CFLAGS += -Igit 34CFLAGS += -Igit
35CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 35CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
36CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 36CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
37CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 37CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
38CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 38CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
39 39
40 40
41# 41#
42# If make is run on a nongit platform, get the git sources as a tarball. 42# If make is run on a nongit platform, get the git sources as a tarball.
43# 43#
44GITVER = $(shell git version 2>/dev/null || echo nogit) 44GITVER = $(shell git version 2>/dev/null || echo nogit)
45ifeq ($(GITVER),nogit) 45ifeq ($(GITVER),nogit)
46GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2 46GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
47INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git) 47INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
48else 48else
49INITGIT = ./submodules.sh -i 49INITGIT = ./submodules.sh -i
50endif 50endif
51 51
52 52
53cgit: cgit.c cgit.h VERSION $(OBJECTS) 53cgit: cgit.c cgit.h VERSION $(OBJECTS)
54 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) 54 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
55 55
56$(OBJECTS): cgit.h git/libgit.a 56$(OBJECTS): cgit.h git/libgit.a
57 57
58git/libgit.a: 58git/libgit.a:
59 $(INITGIT) 59 $(INITGIT)
60 $(MAKE) -C git 60 $(MAKE) -C git
61 61
62# 62#
63# phony targets 63# phony targets
64# 64#
65install: all clean-cache 65install: all clean-cache
66 mkdir -p $(prefix) 66 mkdir -p $(prefix)
67 install cgit $(prefix)/$(CGIT_SCRIPT_NAME) 67 install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
68 install cgit.css $(prefix)/cgit.css 68 install cgit.css $(prefix)/cgit.css
69 69
70clean-cgit: 70clean-cgit:
71 rm -f cgit VERSION *.o 71 rm -f cgit VERSION *.o
72 72
73distclean-cgit: clean-cgit 73distclean-cgit: clean-cgit
74 git clean -d -x 74 git clean -d -x
75 75
76clean-sub: 76clean-sub:
77 $(MAKE) -C git clean 77 $(MAKE) -C git clean
78 78
79distclean-sub: clean-sub 79distclean-sub: clean-sub
80 $(shell cd git && git clean -d -x) 80 $(shell cd git && git clean -d -x)
81 81
82clean-cache: 82clean-cache:
83 rm -rf $(CACHE_ROOT)/* 83 rm -rf $(CACHE_ROOT)/*
84 84
85clean: clean-cgit clean-sub 85clean: clean-cgit clean-sub
86 86
87distclean: distclean-cgit distclean-sub 87distclean: distclean-cgit distclean-sub
88 88
89version: clean-cgit 89version: clean-cgit
90 ./gen-version.sh 90 ./gen-version.sh
91 make 91 make
92 92
93.PHONY: all install clean clean-cgit clean-sub clean-cache \ 93.PHONY: all install clean clean-cgit clean-sub clean-cache \
94 distclean distclean-cgit distclean-sub release version 94 distclean distclean-cgit distclean-sub release version