diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-23 09:09:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-23 09:09:16 +0300 |
| commit | 52890d2afc6a06d6121ae1fd4bfc2448b0d67728 (patch) | |
| tree | 425e9761f3009300630ed927412276415a6f78ec /tools/perf | |
| parent | ea092676b0d9c13f20a3bc02c5b0bf537c27346e (diff) | |
| parent | 5d05dfd13f20b01a3cd5d293058baa7d5c1583b6 (diff) | |
| download | linux-52890d2afc6a06d6121ae1fd4bfc2448b0d67728.tar.xz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Thomas writes:
"- Provide a strerror_r wrapper so lib/bpf can be built on systems
without _GNU_SOURCE
- Unbreak the man page generator when building out of tree"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf Documentation: Fix out-of-tree asciidoctor man page generation
tools lib bpf: Provide wrapper for strerror_r to build in !_GNU_SOURCE systems
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/Documentation/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 $@+ $< && \ |