-rw-r--r-- | Makefile | 2 | ||||
m--------- | git | 0 |
2 files changed, 1 insertions, 1 deletions
@@ -1,55 +1,55 @@ | |||
1 | CGIT_VERSION = v0.8.1 | 1 | CGIT_VERSION = v0.8.1 |
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_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.6.0.3 | 7 | GIT_VER = 1.6.1 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | 9 | ||
10 | # Define NO_STRCASESTR if you don't have strcasestr. | 10 | # Define NO_STRCASESTR if you don't have strcasestr. |
11 | # | 11 | # |
12 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 12 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
13 | # | 13 | # |
14 | 14 | ||
15 | #-include config.mak | 15 | #-include config.mak |
16 | 16 | ||
17 | # | 17 | # |
18 | # Platform specific tweaks | 18 | # Platform specific tweaks |
19 | # | 19 | # |
20 | 20 | ||
21 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 21 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
22 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 22 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
23 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 23 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
24 | 24 | ||
25 | ifeq ($(uname_O),Cygwin) | 25 | ifeq ($(uname_O),Cygwin) |
26 | NO_STRCASESTR = YesPlease | 26 | NO_STRCASESTR = YesPlease |
27 | NEEDS_LIBICONV = YesPlease | 27 | NEEDS_LIBICONV = YesPlease |
28 | endif | 28 | endif |
29 | 29 | ||
30 | # | 30 | # |
31 | # Let the user override the above settings. | 31 | # Let the user override the above settings. |
32 | # | 32 | # |
33 | -include cgit.conf | 33 | -include cgit.conf |
34 | 34 | ||
35 | # | 35 | # |
36 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 36 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
37 | # from git.git | 37 | # from git.git |
38 | # | 38 | # |
39 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 39 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
40 | QUIET_SUBDIR1 = | 40 | QUIET_SUBDIR1 = |
41 | 41 | ||
42 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 42 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
43 | PRINT_DIR = --no-print-directory | 43 | PRINT_DIR = --no-print-directory |
44 | else # "make -w" | 44 | else # "make -w" |
45 | NO_SUBDIR = : | 45 | NO_SUBDIR = : |
46 | endif | 46 | endif |
47 | 47 | ||
48 | ifndef V | 48 | ifndef V |
49 | QUIET_CC = @echo ' ' CC $@; | 49 | QUIET_CC = @echo ' ' CC $@; |
50 | QUIET_MM = @echo ' ' MM $@; | 50 | QUIET_MM = @echo ' ' MM $@; |
51 | QUIET_SUBDIR0 = +@subdir= | 51 | QUIET_SUBDIR0 = +@subdir= |
52 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 52 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
53 | $(MAKE) $(PRINT_DIR) -C $$subdir | 53 | $(MAKE) $(PRINT_DIR) -C $$subdir |
54 | endif | 54 | endif |
55 | 55 | ||
diff --git a/git b/git | |||
Subproject 031e6c898f61db1ae0c0be641eac6532c1000d5 | Subproject 8104ebfe8276657ee803cca7eb8665a78cf3ef8 | ||