diff options
author | Robert Richter <robert.richter@calxeda.com> | 2013-05-06 14:40:14 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-07-08 16:31:49 -0400 |
commit | 761a0f395d5d8b7aafe563ecefbc8cf71a214a91 (patch) | |
tree | d7078f45745d2ac15089a759c4dc2cea5c3a5346 /tools/perf/Documentation | |
parent | 5125bc22e7871b46e71312d6cc4455e9eea1619d (diff) |
perf tools: Fix output directory of Documentation/
The OUTPUT directory is wrongly determind leading to:
make[3]: *** No rule to make target `.../.build/perf/PERF-VERSION-FILE'. Stop.
Fixing this by using the generic approach in script/Makefile.include.
Signed-off-by: Robert Richter <robert.richter@calxeda.com>
Link: http://lkml.kernel.org/r/1367865614-30876-1-git-send-email-rric@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Documentation')
-rw-r--r-- | tools/perf/Documentation/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index f75175757892..5a37a7c84e69 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile | |||
@@ -1,12 +1,6 @@ | |||
1 | include ../../scripts/Makefile.include | ||
1 | include ../config/utilities.mak | 2 | include ../config/utilities.mak |
2 | 3 | ||
3 | OUTPUT := ./ | ||
4 | ifeq ("$(origin O)", "command line") | ||
5 | ifneq ($(O),) | ||
6 | OUTPUT := $(O)/ | ||
7 | endif | ||
8 | endif | ||
9 | |||
10 | MAN1_TXT= \ | 4 | MAN1_TXT= \ |
11 | $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ | 5 | $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ |
12 | $(wildcard perf-*.txt)) \ | 6 | $(wildcard perf-*.txt)) \ |
@@ -277,7 +271,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt | |||
277 | 271 | ||
278 | $(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.xml | 272 | $(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.xml |
279 | $(QUIET_XMLTO)$(RM) $@ && \ | 273 | $(QUIET_XMLTO)$(RM) $@ && \ |
280 | $(XMLTO) -o $(OUTPUT) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< | 274 | $(XMLTO) -o $(OUTPUT). -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< |
281 | 275 | ||
282 | $(OUTPUT)%.xml : %.txt | 276 | $(OUTPUT)%.xml : %.txt |
283 | $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ | 277 | $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ |