diff options
author | Namhyung Kim <namhyung@kernel.org> | 2016-01-09 05:16:28 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-01-12 10:42:07 -0500 |
commit | 84cfac7f05e110e803a45d99cff0ba0949cc8d58 (patch) | |
tree | d04707f7c61a793fb5675d4b5c4b2a8c6f01a834 /tools | |
parent | dd8232bc9d13b729d92590b55befd14e49f81eca (diff) |
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>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Build | 1 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/Build b/tools/perf/Build index 6b67e6f4179f..a43fae7f439a 100644 --- a/tools/perf/Build +++ b/tools/perf/Build | |||
@@ -42,6 +42,7 @@ CFLAGS_perf.o += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))" \ | |||
42 | -include $(OUTPUT)PERF-VERSION-FILE | 42 | -include $(OUTPUT)PERF-VERSION-FILE |
43 | CFLAGS_builtin-trace.o += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))" | 43 | CFLAGS_builtin-trace.o += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))" |
44 | CFLAGS_builtin-report.o += -DTIPDIR="BUILD_STR($(tipdir_SQ))" | 44 | CFLAGS_builtin-report.o += -DTIPDIR="BUILD_STR($(tipdir_SQ))" |
45 | CFLAGS_builtin-report.o += -DDOCDIR="BUILD_STR($(srcdir_SQ)/Documentation)" | ||
45 | 46 | ||
46 | libperf-y += util/ | 47 | libperf-y += util/ |
47 | libperf-y += arch/ | 48 | libperf-y += arch/ |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 7545ba60053e..e5959c136a19 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -692,6 +692,7 @@ template_dir = share/perf-core/templates | |||
692 | STRACE_GROUPS_DIR = share/perf-core/strace/groups | 692 | STRACE_GROUPS_DIR = share/perf-core/strace/groups |
693 | htmldir = share/doc/perf-doc | 693 | htmldir = share/doc/perf-doc |
694 | tipdir = share/doc/perf-tip | 694 | tipdir = share/doc/perf-tip |
695 | srcdir = $(srctree)/tools/perf | ||
695 | ifeq ($(prefix),/usr) | 696 | ifeq ($(prefix),/usr) |
696 | sysconfdir = /etc | 697 | sysconfdir = /etc |
697 | ETC_PERFCONFIG = $(sysconfdir)/perfconfig | 698 | ETC_PERFCONFIG = $(sysconfdir)/perfconfig |
@@ -722,6 +723,7 @@ tipdir_SQ = $(subst ','\'',$(tipdir)) | |||
722 | prefix_SQ = $(subst ','\'',$(prefix)) | 723 | prefix_SQ = $(subst ','\'',$(prefix)) |
723 | sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) | 724 | sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) |
724 | libdir_SQ = $(subst ','\'',$(libdir)) | 725 | libdir_SQ = $(subst ','\'',$(libdir)) |
726 | srcdir_SQ = $(subst ','\'',$(srcdir)) | ||
725 | 727 | ||
726 | ifneq ($(filter /%,$(firstword $(perfexecdir))),) | 728 | ifneq ($(filter /%,$(firstword $(perfexecdir))),) |
727 | perfexec_instdir = $(perfexecdir) | 729 | perfexec_instdir = $(perfexecdir) |
@@ -776,6 +778,7 @@ $(call detected_var,STRACE_GROUPS_DIR_SQ) | |||
776 | $(call detected_var,prefix_SQ) | 778 | $(call detected_var,prefix_SQ) |
777 | $(call detected_var,perfexecdir_SQ) | 779 | $(call detected_var,perfexecdir_SQ) |
778 | $(call detected_var,tipdir_SQ) | 780 | $(call detected_var,tipdir_SQ) |
781 | $(call detected_var,srcdir_SQ) | ||
779 | $(call detected_var,LIBDIR) | 782 | $(call detected_var,LIBDIR) |
780 | $(call detected_var,GTK_CFLAGS) | 783 | $(call detected_var,GTK_CFLAGS) |
781 | $(call detected_var,PERL_EMBED_CCOPTS) | 784 | $(call detected_var,PERL_EMBED_CCOPTS) |