filters: port syntax-highlighting.py to python 3.x

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 93b525a72e446c36f4bc6d095e1ae8b598a75e96..77b9f60d3275a63da579624fb9c79d6f9707cb3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all::
 
-CGIT_VERSION = v0.10.2
+CGIT_VERSION = v0.11.2
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.0.3
+GIT_VER = 2.6.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
@@ -33,6 +33,7 @@ DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 
 #-include config.mak
 
+-include git/config.mak.uname
 #
 # Let the user override the above settings.
 #
@@ -47,7 +48,7 @@ export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG
 QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 
-ifneq ($(findstring $(MAKEFLAGS),w),w)
+ifneq ($(findstring w,$(MAKEFLAGS)),w)
 PRINT_DIR = --no-print-directory
 else # "make -w"
 NO_SUBDIR = :
@@ -68,6 +69,9 @@ all:: cgit
 cgit:
        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1
 
+sparse:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk NO_CURL=1 cgit-sparse
+
 test:
        @$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all