From: Jiri Olsa <jolsa@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jianyu Zhan <nasa4836@gmail.com>,
Jiri Olsa <jolsa@kernel.org>
Subject: [PATCH 9/9] perf tools: Fix 'make help' message error
Date: Tue, 3 Jun 2014 22:36:16 +0200 [thread overview]
Message-ID: <1401827776-4443-10-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1401827776-4443-1-git-send-email-jolsa@kernel.org>
From: Jianyu Zhan <nasa4836@gmail.com>
Currently 'make help' message has such hint:
use "make prefix=<path> <install target>" to install to a particular
path like make prefix=/usr/local install install-doc
But this is misleading, when I specify "prefix=/usr/local", it has got no
respect at all.
This is because that, "DESTDIR" is considered first. In this case, "DESTDIR"
has an empty value, so "prefix" is honored. However, "prefix" is unconditionally
assigned to $HOME, regardless of what it is set to from command line. So our
"prefix" setting got no respect and the actual destination falls back to $HOME.
This patch fixes this issue and corrects the help message.
Signed-off-by: Jianyu Zhan <nasa4836@gmail.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1401727474-19370-1-git-send-email-nasa4836@gmail.com
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/Makefile.perf | 4 ++--
tools/perf/config/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 6286e13..ae20edf 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -789,8 +789,8 @@ help:
@echo ''
@echo 'Perf install targets:'
@echo ' NOTE: documentation build requires asciidoc, xmlto packages to be installed'
- @echo ' HINT: use "make prefix=<path> <install target>" to install to a particular'
- @echo ' path like make prefix=/usr/local install install-doc'
+ @echo ' HINT: use "prefix" or "DESTDIR" to install to a particular'
+ @echo ' path like "make prefix=/usr/local install install-doc"'
@echo ' install - install compiled binaries'
@echo ' install-doc - install *all* documentation'
@echo ' install-man - install manpage documentation'
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 319426f..4f100b5 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -600,7 +600,7 @@ endif
# Make the path relative to DESTDIR, not to prefix
ifndef DESTDIR
-prefix = $(HOME)
+prefix ?= $(HOME)
endif
bindir_relative = bin
bindir = $(prefix)/$(bindir_relative)
--
1.8.3.1
next prev parent reply other threads:[~2014-06-03 20:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 20:36 [GIT PULL 0/9] perf/core improvements and fixes Jiri Olsa
2014-06-03 20:36 ` [PATCH 1/9] perf trace: Warn the user when not available Jiri Olsa
2014-06-03 20:36 ` [PATCH 2/9] perf tools: Add warning when disabling perl scripting support due to missing devel files Jiri Olsa
2014-06-03 20:36 ` [PATCH 3/9] perf tools: Consider header files outside perf directory in tags target Jiri Olsa
2014-06-03 20:36 ` [PATCH 4/9] perf tools: Allow overriding sysfs and proc finding with env var Jiri Olsa
2014-06-03 20:36 ` [PATCH 5/9] perf tools: Fix "==" into "=" in ui_browser__warning assignment Jiri Olsa
2014-06-03 20:36 ` [PATCH 6/9] perf tools: Remove elide setup for SORT_MODE__MEMORY mode Jiri Olsa
2014-06-03 20:36 ` [PATCH 7/9] perf tools: Move elide bool into perf_hpp_fmt struct Jiri Olsa
2014-06-03 20:36 ` [PATCH 8/9] perf record: Fix poll return value propagation Jiri Olsa
2014-06-03 20:36 ` Jiri Olsa [this message]
2014-06-05 8:45 ` [GIT PULL 0/9] perf/core improvements and fixes Ingo Molnar
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=1401827776-4443-10-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=nasa4836@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.