From: tip-bot for Robert Richter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, tglx@linutronix.de, robert.richter@calxeda.com
Subject: [tip:perf/urgent] perf tools: Fix output directory of Documentation/
Date: Fri, 12 Jul 2013 01:49:30 -0700 [thread overview]
Message-ID: <tip-761a0f395d5d8b7aafe563ecefbc8cf71a214a91@git.kernel.org> (raw)
In-Reply-To: <1367865614-30876-1-git-send-email-rric@kernel.org>
Commit-ID: 761a0f395d5d8b7aafe563ecefbc8cf71a214a91
Gitweb: http://git.kernel.org/tip/761a0f395d5d8b7aafe563ecefbc8cf71a214a91
Author: Robert Richter <robert.richter@calxeda.com>
AuthorDate: Mon, 6 May 2013 20:40:14 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 8 Jul 2013 17:31:49 -0300
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>
---
tools/perf/Documentation/Makefile | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index f751757..5a37a7c 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -1,12 +1,6 @@
+include ../../scripts/Makefile.include
include ../config/utilities.mak
-OUTPUT := ./
-ifeq ("$(origin O)", "command line")
- ifneq ($(O),)
- OUTPUT := $(O)/
- endif
-endif
-
MAN1_TXT= \
$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard perf-*.txt)) \
@@ -277,7 +271,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt
$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.xml
$(QUIET_XMLTO)$(RM) $@ && \
- $(XMLTO) -o $(OUTPUT) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+ $(XMLTO) -o $(OUTPUT). -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
$(OUTPUT)%.xml : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
prev parent reply other threads:[~2013-07-12 8:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-06 18:40 [PATCH] perf tools: Fix output directory of Documentation/ Robert Richter
2013-06-20 13:41 ` Jiri Olsa
2013-06-20 14:52 ` Arnaldo Carvalho de Melo
2013-06-20 14:58 ` Jiri Olsa
2013-06-20 15:26 ` Arnaldo Carvalho de Melo
2013-06-21 12:50 ` Robert Richter
2013-06-21 13:34 ` Arnaldo Carvalho de Melo
2013-06-21 14:02 ` Robert Richter
2013-06-27 11:47 ` Robert Richter
2013-07-12 8:49 ` tip-bot for Robert Richter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-761a0f395d5d8b7aafe563ecefbc8cf71a214a91@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=robert.richter@calxeda.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox