diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-08-03 17:52:44 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-08-03 17:52:44 +0200 |
| commit | 42f8840323a219d3eca59a7a2a388c3a28eeb8fb (patch) | |
| tree | ec799ab66ed4119b68268192ea8fbe62a96b51aa /Makefile | |
| parent | 343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4 (diff) | |
| parent | 824138e59194acaf5efe53690d4ef6eaf38e1549 (diff) | |
| download | cgit-42f8840323a219d3eca59a7a2a388c3a28eeb8fb.tar.gz cgit-42f8840323a219d3eca59a7a2a388c3a28eeb8fb.tar.xz | |
Merge branch 'master' of https://git.zx2c4.com/cgit into local
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -1,6 +1,6 @@ all:: -CGIT_VERSION = v1.1 +CGIT_VERSION = v1.2.1 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.16.0 +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 @@ -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). @@ -134,7 +140,8 @@ doc-pdf: $(DOC_PDF) a2x -f manpage $< $(DOC_HTML): %.html : %.txt - a2x -f xhtml --stylesheet=cgit-doc.css --xsltproc-opts="--param generate.consistent.ids 1" $< + $(TXT_TO_HTML) -o $@+ $< && \ + mv $@+ $@ $(DOC_PDF): %.pdf : %.txt a2x -f pdf cgitrc.5.txt |