From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: peterz@infradead.org, acme@redhat.com, wangnan0@huawei.com,
tglx@linutronix.de, andi@firstfloor.org, hpa@zytor.com,
dsahern@gmail.com, namhyung@kernel.org, mingo@kernel.org,
linux-kernel@vger.kernel.org, jolsa@kernel.org
Subject: [tip:perf/urgent] perf tools: Set and pass DOCDIR to builtin-report.c
Date: Wed, 13 Jan 2016 01:42:25 -0800 [thread overview]
Message-ID: <tip-84cfac7f05e110e803a45d99cff0ba0949cc8d58@git.kernel.org> (raw)
In-Reply-To: <1452334589-8782-3-git-send-email-namhyung@kernel.org>
Commit-ID: 84cfac7f05e110e803a45d99cff0ba0949cc8d58
Gitweb: http://git.kernel.org/tip/84cfac7f05e110e803a45d99cff0ba0949cc8d58
Author: Namhyung Kim <namhyung@kernel.org>
AuthorDate: Sat, 9 Jan 2016 19:16:28 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 12 Jan 2016 12:42:07 -0300
perf tools: Set and pass DOCDIR to builtin-report.c
It'll be used to locate perf document directory to find tips.txt in case
it's not installed on the system.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1452334589-8782-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Build | 1 +
tools/perf/config/Makefile | 3 +++
2 files changed, 4 insertions(+)
diff --git a/tools/perf/Build b/tools/perf/Build
index 6b67e6f..a43fae7 100644
--- a/tools/perf/Build
+++ b/tools/perf/Build
@@ -42,6 +42,7 @@ CFLAGS_perf.o += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))" \
-include $(OUTPUT)PERF-VERSION-FILE
CFLAGS_builtin-trace.o += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))"
CFLAGS_builtin-report.o += -DTIPDIR="BUILD_STR($(tipdir_SQ))"
+CFLAGS_builtin-report.o += -DDOCDIR="BUILD_STR($(srcdir_SQ)/Documentation)"
libperf-y += util/
libperf-y += arch/
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 7545ba60..e5959c1 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -692,6 +692,7 @@ template_dir = share/perf-core/templates
STRACE_GROUPS_DIR = share/perf-core/strace/groups
htmldir = share/doc/perf-doc
tipdir = share/doc/perf-tip
+srcdir = $(srctree)/tools/perf
ifeq ($(prefix),/usr)
sysconfdir = /etc
ETC_PERFCONFIG = $(sysconfdir)/perfconfig
@@ -722,6 +723,7 @@ tipdir_SQ = $(subst ','\'',$(tipdir))
prefix_SQ = $(subst ','\'',$(prefix))
sysconfdir_SQ = $(subst ','\'',$(sysconfdir))
libdir_SQ = $(subst ','\'',$(libdir))
+srcdir_SQ = $(subst ','\'',$(srcdir))
ifneq ($(filter /%,$(firstword $(perfexecdir))),)
perfexec_instdir = $(perfexecdir)
@@ -776,6 +778,7 @@ $(call detected_var,STRACE_GROUPS_DIR_SQ)
$(call detected_var,prefix_SQ)
$(call detected_var,perfexecdir_SQ)
$(call detected_var,tipdir_SQ)
+$(call detected_var,srcdir_SQ)
$(call detected_var,LIBDIR)
$(call detected_var,GTK_CFLAGS)
$(call detected_var,PERL_EMBED_CCOPTS)
next prev parent reply other threads:[~2016-01-13 9:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-09 10:16 [PATCH 1/4] perf tools: Add more usage tips Namhyung Kim
2016-01-09 10:16 ` [PATCH 2/4] perf tools: Add file_only config option to strlist Namhyung Kim
2016-01-13 9:42 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2016-01-09 10:16 ` [PATCH 3/4] perf tools: Set and pass DOCDIR to builtin-report.c Namhyung Kim
2016-01-13 9:42 ` tip-bot for Namhyung Kim [this message]
2016-01-09 10:16 ` [PATCH 4/4] perf tools: Fallback to srcdir/Documentation/tips.txt Namhyung Kim
2016-01-11 9:18 ` Jiri Olsa
2016-01-12 15:34 ` Arnaldo Carvalho de Melo
2016-01-12 15:39 ` Arnaldo Carvalho de Melo
2016-01-12 15:22 ` Arnaldo Carvalho de Melo
2016-01-13 9:43 ` [tip:perf/urgent] perf tools: Fallback to srcdir/Documentation/ tips.txt tip-bot for Namhyung Kim
2016-01-10 3:38 ` [PATCH 1/4] perf tools: Add more usage tips Andi Kleen
2016-01-11 10:35 ` [PATCH v2 " Namhyung Kim
2016-01-11 10:53 ` [PATCH 5/4] perf ui/tui: Print helpline message as is Namhyung Kim
2016-01-12 15:23 ` Arnaldo Carvalho de Melo
2016-01-13 9:42 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2016-01-13 9:41 ` [tip:perf/urgent] perf tools: Add more usage tips tip-bot for Namhyung Kim
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-84cfac7f05e110e803a45d99cff0ba0949cc8d58@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).