author | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:52:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:52:42 (UTC) |
commit | c8bc3fc04c9af0fd881fb43b8e540fd93920b851 (patch) (unidiff) | |
tree | 21b4df18d1519db30ee3089ac3adfd9b2a088dd9 | |
parent | c2766deb67acb1eae2b36dc0f5811a9cabb6db20 (diff) | |
parent | f072bc55b08675db93b2f892016e83d9f975dea2 (diff) | |
download | cgit-c8bc3fc04c9af0fd881fb43b8e540fd93920b851.zip cgit-c8bc3fc04c9af0fd881fb43b8e540fd93920b851.tar.gz cgit-c8bc3fc04c9af0fd881fb43b8e540fd93920b851.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,49 +1,49 @@ | |||
1 | CGIT_VERSION = v0.8.3.1 | 1 | CGIT_VERSION = v0.8.3.2 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | 4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.7.0 | 8 | GIT_VER = 1.7.0 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 10 | INSTALL = 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). |
18 | # | 18 | # |
19 | 19 | ||
20 | #-include config.mak | 20 | #-include config.mak |
21 | 21 | ||
22 | # | 22 | # |
23 | # Platform specific tweaks | 23 | # Platform specific tweaks |
24 | # | 24 | # |
25 | 25 | ||
26 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 26 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
27 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 27 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
29 | 29 | ||
30 | ifeq ($(uname_O),Cygwin) | 30 | ifeq ($(uname_O),Cygwin) |
31 | NO_STRCASESTR = YesPlease | 31 | NO_STRCASESTR = YesPlease |
32 | NEEDS_LIBICONV = YesPlease | 32 | NEEDS_LIBICONV = YesPlease |
33 | endif | 33 | endif |
34 | 34 | ||
35 | # | 35 | # |
36 | # Let the user override the above settings. | 36 | # Let the user override the above settings. |
37 | # | 37 | # |
38 | -include cgit.conf | 38 | -include cgit.conf |
39 | 39 | ||
40 | # | 40 | # |
41 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 41 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
42 | # from git.git | 42 | # from git.git |
43 | # | 43 | # |
44 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 44 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
45 | QUIET_SUBDIR1 = | 45 | QUIET_SUBDIR1 = |
46 | 46 | ||
47 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 47 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
48 | PRINT_DIR = --no-print-directory | 48 | PRINT_DIR = --no-print-directory |
49 | else # "make -w" | 49 | else # "make -w" |