From 173319e7e1599ef9d08b985740e55020ebc2ea85 Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Wed, 24 Apr 2019 12:59:20 +0200 Subject: [PATCH] documentation: Makefile: always build using asciidoctor (remove a2x) Remove support for man page generation using asciidoc "a2x": The project is discontinued, and depends on Python 2.7. As we will provide pre-generated man pages as of btrbk-0.28.0, this is not needed any more. --- doc/Makefile | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index c18be908..9b77bf60 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -19,19 +19,8 @@ ifeq ($(COMPRESS), yes) endif # convert using "asciidoctor": -# fallback to "a2x" from asciidoc package: -ifneq (, $(shell command -v asciidoctor 2> /dev/null)) - ASCIIDOC_MANPAGE = asciidoctor -d manpage -b manpage - ASCIIDOC_HTML = asciidoctor -b html5 -d article -else ifneq (, $(shell command -v a2x 2> /dev/null)) - # NOTE: using -L (--no-xmllint), as xmllint is a separate package on many distros. - ASCIIDOC_MANPAGE = a2x -L -d manpage -f manpage - ASCIIDOC_HTML = asciidoc -b html -d article -else - ASCIIDOC_ERR = $(error "please install either asciidoc or asciidoctor") - ASCIIDOC_MANPAGE = $(ASCIIDOC_ERR) - ASCIIDOC_HTML = $(ASCIIDOC_ERR) -endif +ASCIIDOCTOR_MANPAGE = asciidoctor -d manpage -b manpage +ASCIIDOCTOR_HTML = asciidoctor -b html5 -d article all: man @@ -58,10 +47,10 @@ clean: gzip -9 -n -c $< > $@ %.1 : %.1.asciidoc - $(ASCIIDOC_MANPAGE) $< + $(ASCIIDOCTOR_MANPAGE) -o $@ $< %.5 : %.5.asciidoc - $(ASCIIDOC_MANPAGE) $< + $(ASCIIDOCTOR_MANPAGE) -o $@ $< %.html : %.asciidoc - $(ASCIIDOC_HTML) -o $@ $< + $(ASCIIDOCTOR_HTML) -o $@ $<