css: use correct size in annotated decoration

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 83d471665e3ca2af793fa4fac8eade40890f0a8e..137150c956c7faa27835e2fab40debd2c3fd5b0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 all::
 
-CGIT_VERSION = v0.9.1
+CGIT_VERSION = v1.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
-prefix = /usr
+prefix = /usr/local
 libdir = $(prefix)/lib
 filterdir = $(libdir)/cgit/filters
 docdir = $(prefix)/share/doc/cgit
@@ -14,29 +14,38 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.12.4
-GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
+GIT_VER = 2.18.0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
+COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
 DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
 DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
 DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 
+ASCIIDOC = asciidoc
+ASCIIDOC_EXTRA =
+ASCIIDOC_HTML = xhtml11
+ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA)
+TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
+
 # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
 # do not support the 'size specifiers' introduced by C99, namely ll, hh,
 # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
 # some C compilers supported these specifiers prior to C99 as an extension.
 #
+# Define HAVE_LINUX_SENDFILE to use sendfile()
 
 #-include config.mak
 
+-include git/config.mak.uname
 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 
-export CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
+export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
 
 #
 # Define a way to invoke make in subdirs quietly, shamelessly ripped
@@ -45,7 +54,7 @@ export CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
 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 = :
@@ -64,9 +73,13 @@ endif
 all:: cgit
 
 cgit:
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit NO_CURL=1
+       $(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: all
+test:
+       @$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
@@ -75,8 +88,10 @@ install: all
        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
        $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
+       $(INSTALL) -m 0644 favicon.ico $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico
+       $(INSTALL) -m 0644 robots.txt $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt
        $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
-       $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
+       $(COPYTREE) filters/* $(DESTDIR)$(filterdir)
 
 install-doc: install-man install-html install-pdf
 
@@ -96,6 +111,7 @@ uninstall:
        rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico
 
 uninstall-doc: uninstall-man uninstall-html uninstall-pdf
 
@@ -124,7 +140,8 @@ doc-pdf: $(DOC_PDF)
        a2x -f manpage $<
 
 $(DOC_HTML): %.html : %.txt
-       a2x -f xhtml --stylesheet=cgit-doc.css $<
+       $(TXT_TO_HTML) -o $@+ $< && \
+       mv $@+ $@
 
 $(DOC_PDF): %.pdf : %.txt
        a2x -f pdf cgitrc.5.txt
@@ -145,7 +162,7 @@ get-git:
 tags:
        $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
 
-.PHONY: all cgit get-git
+.PHONY: all cgit git get-git
 .PHONY: clean clean-doc cleanall
 .PHONY: doc doc-html doc-man doc-pdf
 .PHONY: install install-doc install-html install-man install-pdf