* [PATCH] perf Documentation: Fix out-of-tree asciidoctor man page generation
@ 2018-09-16 15:17 Ben Hutchings
2018-09-17 15:20 ` Arnaldo Carvalho de Melo
2018-09-19 11:37 ` [tip:perf/urgent] " tip-bot for Ben Hutchings
0 siblings, 2 replies; 3+ messages in thread
From: Ben Hutchings @ 2018-09-16 15:17 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Alexander Shishkin, Jiri Olsa, Namhyung Kim
Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
The dependency for the man page rule using asciidoctor incorrectly
specifies a source file in $(OUTPUT). When building out-of-tree, the
source file is not found, resulting in a fall-back to the following
rule which uses xmlto.
Fixes: ffef80ecf89f ("perf Documentation: Support for asciidoctor")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -285,7 +285,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt
mv $@+ $@
ifdef USE_ASCIIDOCTOR
-$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.txt
+$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(ASCIIDOC) -b manpage -d manpage \
$(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) -o $@+ $< && \
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] perf Documentation: Fix out-of-tree asciidoctor man page generation
2018-09-16 15:17 [PATCH] perf Documentation: Fix out-of-tree asciidoctor man page generation Ben Hutchings
@ 2018-09-17 15:20 ` Arnaldo Carvalho de Melo
2018-09-19 11:37 ` [tip:perf/urgent] " tip-bot for Ben Hutchings
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-09-17 15:20 UTC (permalink / raw)
To: Ben Hutchings
Cc: Peter Zijlstra, Ingo Molnar, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, linux-kernel
Em Sun, Sep 16, 2018 at 04:17:05PM +0100, Ben Hutchings escreveu:
> The dependency for the man page rule using asciidoctor incorrectly
> specifies a source file in $(OUTPUT). When building out-of-tree, the
> source file is not found, resulting in a fall-back to the following
> rule which uses xmlto.
>
> Fixes: ffef80ecf89f ("perf Documentation: Support for asciidoctor")
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Thanks, applied.
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:perf/urgent] perf Documentation: Fix out-of-tree asciidoctor man page generation
2018-09-16 15:17 [PATCH] perf Documentation: Fix out-of-tree asciidoctor man page generation Ben Hutchings
2018-09-17 15:20 ` Arnaldo Carvalho de Melo
@ 2018-09-19 11:37 ` tip-bot for Ben Hutchings
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Ben Hutchings @ 2018-09-19 11:37 UTC (permalink / raw)
To: linux-tip-commits
Cc: peterz, acme, namhyung, tglx, hpa, jolsa, linux-kernel, mingo,
alexander.shishkin, ben
Commit-ID: 169e366c08084aeb49a3793c892c9abfaa47eeda
Gitweb: https://git.kernel.org/tip/169e366c08084aeb49a3793c892c9abfaa47eeda
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Sun, 16 Sep 2018 16:17:05 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 18 Sep 2018 10:17:16 -0300
perf Documentation: Fix out-of-tree asciidoctor man page generation
The dependency for the man page rule using asciidoctor incorrectly
specifies a source file in $(OUTPUT). When building out-of-tree, the
source file is not found, resulting in a fall-back to the following rule
which uses xmlto.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180916151704.GF4765@decadent.org.uk
Fixes: ffef80ecf89f ("perf Documentation: Support for asciidoctor")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Documentation/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index 42261a9b280e..ac841bc5c35b 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -280,7 +280,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt
mv $@+ $@
ifdef USE_ASCIIDOCTOR
-$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.txt
+$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(ASCIIDOC) -b manpage -d manpage \
$(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) -o $@+ $< && \
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-19 11:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-16 15:17 [PATCH] perf Documentation: Fix out-of-tree asciidoctor man page generation Ben Hutchings
2018-09-17 15:20 ` Arnaldo Carvalho de Melo
2018-09-19 11:37 ` [tip:perf/urgent] " tip-bot for Ben Hutchings
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).