tests: t0107: support older and/or non-GNU tar

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 77b9f60d3275a63da579624fb9c79d6f9707cb3e..6dfc003d5910d750f2f18807e3c24f9d51626c0b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all::
 
-CGIT_VERSION = v0.11.2
+CGIT_VERSION = v1.2.3
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.6.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
+GIT_VER = 2.30.0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
@@ -24,6 +24,12 @@ 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).
@@ -85,7 +91,7 @@ install: all
        $(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)
-       $(COPYTREE)  filters/* $(DESTDIR)$(filterdir)
+       $(COPYTREE) filters/* $(DESTDIR)$(filterdir)
 
 install-doc: install-man install-html install-pdf
 
@@ -134,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
@@ -150,7 +157,7 @@ clean-doc:
        $(RM) cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
 
 get-git:
-       curl -L $(GIT_URL) | tar -xzf - && rm -rf git && mv git-$(GIT_VER) git
+       curl -L $(GIT_URL) | tar -xJf - && rm -rf git && mv git-$(GIT_VER) git
 
 tags:
        $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags