author | Lars Hjemli <hjemli@gmail.com> | 2010-09-27 06:03:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-27 06:20:42 (UTC) |
commit | d41b2ddcb331caa74c1a90a0253f234142848552 (patch) (unidiff) | |
tree | 5e1863b49166c72200b49793f5977d513d6329ec | |
parent | 9043b46f85eb43c918a172663af34c084587bd1a (diff) | |
parent | af492114ccf6d5ab72890277ad828cf6d9fa8909 (diff) | |
download | cgit-d41b2ddcb331caa74c1a90a0253f234142848552.zip cgit-d41b2ddcb331caa74c1a90a0253f234142848552.tar.gz cgit-d41b2ddcb331caa74c1a90a0253f234142848552.tar.bz2 |
Merge branch 'stable'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,65 +1,65 @@ | |||
1 | CGIT_VERSION = v0.8.3.3 | 1 | CGIT_VERSION = v0.8.3.4 |
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.3 | 8 | GIT_VER = 1.7.3 |
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 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) | 19 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) |
20 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, | 20 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, |
21 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). | 21 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). |
22 | # some C compilers supported these specifiers prior to C99 as an extension. | 22 | # some C compilers supported these specifiers prior to C99 as an extension. |
23 | # | 23 | # |
24 | 24 | ||
25 | #-include config.mak | 25 | #-include config.mak |
26 | 26 | ||
27 | # | 27 | # |
28 | # Platform specific tweaks | 28 | # Platform specific tweaks |
29 | # | 29 | # |
30 | 30 | ||
31 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 31 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
32 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 32 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
33 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 33 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
34 | 34 | ||
35 | ifeq ($(uname_O),Cygwin) | 35 | ifeq ($(uname_O),Cygwin) |
36 | NO_STRCASESTR = YesPlease | 36 | NO_STRCASESTR = YesPlease |
37 | NEEDS_LIBICONV = YesPlease | 37 | NEEDS_LIBICONV = YesPlease |
38 | endif | 38 | endif |
39 | 39 | ||
40 | # | 40 | # |
41 | # Let the user override the above settings. | 41 | # Let the user override the above settings. |
42 | # | 42 | # |
43 | -include cgit.conf | 43 | -include cgit.conf |
44 | 44 | ||
45 | # | 45 | # |
46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
47 | # from git.git | 47 | # from git.git |
48 | # | 48 | # |
49 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 49 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
50 | QUIET_SUBDIR1 = | 50 | QUIET_SUBDIR1 = |
51 | 51 | ||
52 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 52 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
53 | PRINT_DIR = --no-print-directory | 53 | PRINT_DIR = --no-print-directory |
54 | else # "make -w" | 54 | else # "make -w" |
55 | NO_SUBDIR = : | 55 | NO_SUBDIR = : |
56 | endif | 56 | endif |
57 | 57 | ||
58 | ifndef V | 58 | ifndef V |
59 | QUIET_CC = @echo ' ' CC $@; | 59 | QUIET_CC = @echo ' ' CC $@; |
60 | QUIET_MM = @echo ' ' MM $@; | 60 | QUIET_MM = @echo ' ' MM $@; |
61 | QUIET_SUBDIR0 = +@subdir= | 61 | QUIET_SUBDIR0 = +@subdir= |
62 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 62 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
63 | $(MAKE) $(PRINT_DIR) -C $$subdir | 63 | $(MAKE) $(PRINT_DIR) -C $$subdir |
64 | endif | 64 | endif |
65 | 65 | ||