From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933754AbcAMJnT (ORCPT ); Wed, 13 Jan 2016 04:43:19 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48785 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754458AbcAMJnQ (ORCPT ); Wed, 13 Jan 2016 04:43:16 -0500 Date: Wed, 13 Jan 2016 01:42:25 -0800 From: tip-bot for Namhyung Kim Message-ID: 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 Reply-To: tglx@linutronix.de, andi@firstfloor.org, peterz@infradead.org, wangnan0@huawei.com, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, dsahern@gmail.com, namhyung@kernel.org In-Reply-To: <1452334589-8782-3-git-send-email-namhyung@kernel.org> References: <1452334589-8782-3-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Set and pass DOCDIR to builtin-report.c Git-Commit-ID: 84cfac7f05e110e803a45d99cff0ba0949cc8d58 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 84cfac7f05e110e803a45d99cff0ba0949cc8d58 Gitweb: http://git.kernel.org/tip/84cfac7f05e110e803a45d99cff0ba0949cc8d58 Author: Namhyung Kim AuthorDate: Sat, 9 Jan 2016 19:16:28 +0900 Committer: Arnaldo Carvalho de Melo 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 Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1452334589-8782-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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)