summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-02-02 07:55:09 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-02-02 07:55:09 (UTC)
commit2106c96ca0d6150ea728b8ac9fbbc918e9086b58 (patch) (unidiff)
tree9e6a74fba938dc113b8081058485c44c0efc53a3
parentac195ce710dc7fc453dfd4b40d8e61c9cc83d9e8 (diff)
downloadcgit-2106c96ca0d6150ea728b8ac9fbbc918e9086b58.zip
cgit-2106c96ca0d6150ea728b8ac9fbbc918e9086b58.tar.gz
cgit-2106c96ca0d6150ea728b8ac9fbbc918e9086b58.tar.bz2
Use GIT-1.5.4
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
m---------git0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6986dc6..bcea640 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,23 @@
1CGIT_VERSION = v0.7.2 1CGIT_VERSION = v0.7.2
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.4.rc5 7GIT_VER = 1.5.4
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
11# Let the user override the above settings. 11# Let the user override the above settings.
12# 12#
13-include cgit.conf 13-include cgit.conf
14 14
15 15
16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ 18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o 19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o
20 20
21 21
22ifdef NEEDS_LIBICONV 22ifdef NEEDS_LIBICONV
23 EXTLIBS += -liconv 23 EXTLIBS += -liconv
diff --git a/git b/git
Subproject bf5aeb150681ed743d317702eaf123c34b05c31 Subproject c3c135291a62a01f7fd385f46cde34091767259