From: Ben Hutchings <benh@debian.org>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>
Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] perf docs: Fix build with asciidoctor
Date: Sun, 23 Mar 2025 21:37:16 +0100 [thread overview]
Message-ID: <Z-Bw_LDgzLJD_-Z5@decadent.org.uk> (raw)
In-Reply-To: <Z-Bw0XbCBfn7yrcs@decadent.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1499 bytes --]
Currently we unconditionally add "--unsafe -f asciidoc.conf" to
ASCIIDOC_EXTRA, but asciidoctor doesn't support these options.
Make all the ASCIIDOC_* variable assignments conditional on whether
USE_ASCIIDOCTOR is set.
Fixes: e9cfa47e687d ("perf doc: allow ASCIIDOC_EXTRA to be an argument")
Signed-off-by: Ben Hutchings <benh@debian.org>
---
tools/perf/Documentation/Makefile | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index 4407b106d977..f566e3e98c22 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -44,17 +44,11 @@ man1dir=$(mandir)/man1
man5dir=$(mandir)/man5
man7dir=$(mandir)/man7
+ifndef USE_ASCIIDOCTOR
ASCIIDOC=asciidoc
ASCIIDOC_EXTRA += --unsafe -f asciidoc.conf
ASCIIDOC_HTML = xhtml11
-MANPAGE_XSL = manpage-normal.xsl
-XMLTO_EXTRA =
-INSTALL?=install
-RM ?= rm -f
-DOC_REF = origin/man
-HTML_REF = origin/html
-
-ifdef USE_ASCIIDOCTOR
+else
ASCIIDOC = asciidoctor
ASCIIDOC_EXTRA += -a compat-mode
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
@@ -62,6 +56,13 @@ ASCIIDOC_EXTRA += -a mansource="perf" -a manmanual="perf Manual"
ASCIIDOC_HTML = xhtml5
endif
+MANPAGE_XSL = manpage-normal.xsl
+XMLTO_EXTRA =
+INSTALL?=install
+RM ?= rm -f
+DOC_REF = origin/man
+HTML_REF = origin/html
+
infodir?=$(prefix)/share/info
MAKEINFO=makeinfo
INSTALL_INFO=install-info
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2025-03-23 20:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-23 20:36 [PATCH 0/2] " Ben Hutchings
2025-03-23 20:37 ` Ben Hutchings [this message]
2025-03-23 20:37 ` [PATCH 2/2] perf docs: Fix perf-check manual page built " Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z-Bw_LDgzLJD_-Z5@decadent.org.uk \
--to=benh@debian.org \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®