|
diff --git a/Makefile b/Makefile index 2cf8b80..0f0089a 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,65 +1,65 @@ |
1 | CGIT_VERSION = v0.8.1.1 |
1 | CGIT_VERSION = v0.8.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.6.1.1 |
8 | GIT_VER = 1.6.1.1 |
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 NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
14 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
15 | # |
15 | # |
16 | |
16 | |
17 | #-include config.mak |
17 | #-include config.mak |
18 | |
18 | |
19 | # |
19 | # |
20 | # Platform specific tweaks |
20 | # Platform specific tweaks |
21 | # |
21 | # |
22 | |
22 | |
23 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
23 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
24 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
24 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
25 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
25 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
26 | |
26 | |
27 | ifeq ($(uname_O),Cygwin) |
27 | ifeq ($(uname_O),Cygwin) |
28 | NO_STRCASESTR = YesPlease |
28 | NO_STRCASESTR = YesPlease |
29 | NEEDS_LIBICONV = YesPlease |
29 | NEEDS_LIBICONV = YesPlease |
30 | endif |
30 | endif |
31 | |
31 | |
32 | # |
32 | # |
33 | # Let the user override the above settings. |
33 | # Let the user override the above settings. |
34 | # |
34 | # |
35 | -include cgit.conf |
35 | -include cgit.conf |
36 | |
36 | |
37 | # |
37 | # |
38 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
38 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
39 | # from git.git |
39 | # from git.git |
40 | # |
40 | # |
41 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
41 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
42 | QUIET_SUBDIR1 = |
42 | QUIET_SUBDIR1 = |
43 | |
43 | |
44 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
44 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
45 | PRINT_DIR = --no-print-directory |
45 | PRINT_DIR = --no-print-directory |
46 | else # "make -w" |
46 | else # "make -w" |
47 | NO_SUBDIR = : |
47 | NO_SUBDIR = : |
48 | endif |
48 | endif |
49 | |
49 | |
50 | ifndef V |
50 | ifndef V |
51 | QUIET_CC = @echo ' ' CC $@; |
51 | QUIET_CC = @echo ' ' CC $@; |
52 | QUIET_MM = @echo ' ' MM $@; |
52 | QUIET_MM = @echo ' ' MM $@; |
53 | QUIET_SUBDIR0 = +@subdir= |
53 | QUIET_SUBDIR0 = +@subdir= |
54 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
54 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
55 | $(MAKE) $(PRINT_DIR) -C $$subdir |
55 | $(MAKE) $(PRINT_DIR) -C $$subdir |
56 | endif |
56 | endif |
57 | |
57 | |
58 | # |
58 | # |
59 | # Define a pattern rule for automatic dependency building |
59 | # Define a pattern rule for automatic dependency building |
60 | # |
60 | # |
61 | %.d: %.c |
61 | %.d: %.c |
62 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
62 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
63 | |
63 | |
64 | # |
64 | # |
65 | # Define a pattern rule for silent object building |
65 | # Define a pattern rule for silent object building |
|