author | Michael Krelin <hacker@klever.net> | 2007-07-02 00:29:11 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-07-03 19:30:05 (UTC) |
commit | 71ebcbe23ab548e5c0ad40aa8be5741654ed3201 (patch) (unidiff) | |
tree | c3f4e7b5aaf6c47713a64a1d01e7330ec3397754 | |
parent | 51f6547879e2516b9850b0b3c51df044c16a8a52 (diff) | |
download | cgit-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>
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,50 +1,50 @@ | |||
1 | prefix = /var/www/htdocs/cgit | 1 | prefix = /var/www/htdocs/cgit |
2 | SHA1_HEADER = <openssl/sha.h> | 2 | SHA1_HEADER = <openssl/sha.h> |
3 | CACHE_ROOT = /var/cache/cgit | 3 | CACHE_ROOT = /var/cache/cgit |
4 | CGIT_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
5 | CGIT_SCRIPT_NAME = cgit.cgi | 5 | CGIT_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 | ||
13 | CGIT_VERSION = 0.5 | 13 | CGIT_VERSION = 0.5 |
14 | 14 | ||
15 | all: cgit | 15 | all: cgit |
16 | 16 | ||
17 | VERSION: | 17 | VERSION: |
18 | gen-version.sh | 18 | sh gen-version.sh |
19 | 19 | ||
20 | -include VERSION | 20 | -include VERSION |
21 | 21 | ||
22 | 22 | ||
23 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 23 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
24 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 24 | OBJECTS = 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 | ||
28 | CFLAGS += -Wall | 28 | CFLAGS += -Wall |
29 | 29 | ||
30 | ifdef DEBUG | 30 | ifdef DEBUG |
31 | CFLAGS += -g | 31 | CFLAGS += -g |
32 | endif | 32 | endif |
33 | 33 | ||
34 | CFLAGS += -Igit | 34 | CFLAGS += -Igit |
35 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 35 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
36 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 36 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
37 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 37 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
38 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 38 | CFLAGS += -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 | # |
44 | GITVER = $(shell git version 2>/dev/null || echo nogit) | 44 | GITVER = $(shell git version 2>/dev/null || echo nogit) |
45 | ifeq ($(GITVER),nogit) | 45 | ifeq ($(GITVER),nogit) |
46 | GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2 | 46 | GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2 |
47 | INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git) | 47 | INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git) |
48 | else | 48 | else |
49 | INITGIT = ./submodules.sh -i | 49 | INITGIT = ./submodules.sh -i |
50 | endif | 50 | endif |