summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-09-27 06:03:30 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-09-27 06:20:42 (UTC)
commitd41b2ddcb331caa74c1a90a0253f234142848552 (patch) (unidiff)
tree5e1863b49166c72200b49793f5977d513d6329ec
parent9043b46f85eb43c918a172663af34c084587bd1a (diff)
parentaf492114ccf6d5ab72890277ad828cf6d9fa8909 (diff)
downloadcgit-d41b2ddcb331caa74c1a90a0253f234142848552.zip
cgit-d41b2ddcb331caa74c1a90a0253f234142848552.tar.gz
cgit-d41b2ddcb331caa74c1a90a0253f234142848552.tar.bz2
Merge branch 'stable'
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 6a47ed2..dda743d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
1CGIT_VERSION = v0.8.3.3 1CGIT_VERSION = v0.8.3.4
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_DATA_PATH = $(CGIT_SCRIPT_PATH) 4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
5CGIT_CONFIG = /etc/cgitrc 5CGIT_CONFIG = /etc/cgitrc
6CACHE_ROOT = /var/cache/cgit 6CACHE_ROOT = /var/cache/cgit
7SHA1_HEADER = <openssl/sha.h> 7SHA1_HEADER = <openssl/sha.h>
8GIT_VER = 1.7.3 8GIT_VER = 1.7.3
9GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 9GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
10INSTALL = install 10INSTALL = install
11 11
12# Define NO_STRCASESTR if you don't have strcasestr. 12# Define NO_STRCASESTR if you don't have strcasestr.
13# 13#
14# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 14# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
15# implementation (slower). 15# implementation (slower).
16# 16#
17# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). 17# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).