Skip to contentSkip to conversation

perf Documentation: Fix out-of-tree asciidoctor man page generation

PATCH Applied Ben Hutchings 3 participants 3 messages Sep 16, 2018 – Sep 19, 2018 perf events

lore
Share & tools
lore

Ben Hutchings

author
#0 lore raw

PATCH 1/1 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.

Fixes ffef80ecf89f ("perf Documentation: Support for asciidoctor")
Signed-off-by Ben Hutchings <[email protected]>

---

tools/perf/Documentation/Makefile +1 -1
@@ -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 $@+ $< && \
maintainer Applied
#1 lore raw

Em Sun, Sep 16, 2018 at 04:17:05PM +0100, Ben Hutchings escreveu:

Quoted 7 lines

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 <[email protected]>

Thanks, applied.

- Arnaldo

merge bot
#2 lore raw
In reply to Ben Hutchings
perf Documentation: Fix out-of-tree asciidoctor man page generation
Commit-ID:  169e366c08084aeb49a3793c892c9abfaa47eeda
Gitweb:     https://git.kernel.org/tip/169e366c08084aeb49a3793c892c9abfaa47eeda
Author:     Ben Hutchings <[email protected]>
AuthorDate: Sun, 16 Sep 2018 16:17:05 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Fixes ffef80ecf89f ("perf Documentation: Support for asciidoctor")
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/Documentation/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/Documentation/Makefile +1 -1
index 42261a9b280e..ac841bc5c35b 100644
@@ -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 $@+ $< && \