diff options
| author | Ingo Molnar | 2018-09-19 13:25:35 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-09-19 13:25:35 +0200 |
| commit | 5d05dfd13f20b01a3cd5d293058baa7d5c1583b6 (patch) | |
| tree | 495ef23dd291a860be093e00b54ff2bcc196476d /tools/perf/Documentation/Makefile | |
| parent | Merge tag 'trace-v4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | perf Documentation: Fix out-of-tree asciidoctor man page generation (diff) | |
| download | kernel-qcow2-linux-5d05dfd13f20b01a3cd5d293058baa7d5c1583b6.tar.gz kernel-qcow2-linux-5d05dfd13f20b01a3cd5d293058baa7d5c1583b6.tar.xz kernel-qcow2-linux-5d05dfd13f20b01a3cd5d293058baa7d5c1583b6.zip | |
Merge tag 'perf-urgent-for-mingo-4.19-20180918' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Fix the build on !_GNU_SOURCE libc systems such as Alpine Linux/musl
libc due to usage of strerror_r glibc variant on libbpf (Arnaldo Carvalho de Melo)
- Fix out-of-tree asciidoctor man page generation (Ben Hutchings)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/Documentation/Makefile')
| -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 $@+ $< && \ |