| author | Lars Hjemli <hjemli@gmail.com> | 2008-12-05 17:47:16 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-05 17:47:16 (UTC) |
| commit | a5e899e4c786e2ed7f58874d66956bf196cef8df (patch) (side-by-side diff) | |
| tree | 278552e943702f74a8c696fb11d91bc94cf6307b | |
| parent | 97fdac1608a0b4b07aae26b144c6ee7991e6c5eb (diff) | |
| download | cgit-a5e899e4c786e2ed7f58874d66956bf196cef8df.zip cgit-a5e899e4c786e2ed7f58874d66956bf196cef8df.tar.gz cgit-a5e899e4c786e2ed7f58874d66956bf196cef8df.tar.bz2 | |
Makefile: allow cgit.conf to override platform-specific tweaks
If the makefile doesn't automatically define the correct build variables
it is nice to be able to define them explicitly.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2,21 +2,16 @@ CGIT_VERSION = v0.8.1 CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_CONFIG = /etc/cgitrc CACHE_ROOT = /var/cache/cgit SHA1_HEADER = <openssl/sha.h> GIT_VER = 1.6.0.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 -# -# Let the user override the above settings. -# --include cgit.conf - # Define NO_STRCASESTR if you don't have strcasestr. # # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). # #-include config.mak # @@ -28,16 +23,21 @@ uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') ifeq ($(uname_O),Cygwin) NO_STRCASESTR = YesPlease NEEDS_LIBICONV = YesPlease endif # +# Let the user override the above settings. +# +-include cgit.conf + +# # Define a way to invoke make in subdirs quietly, shamelessly ripped # from git.git # QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = ifneq ($(findstring $(MAKEFLAGS),w),w) PRINT_DIR = --no-print-directory |