Commit fc9cabea authored by Jianyu Zhan's avatar Jianyu Zhan Committed by Jiri Olsa

perf tools: Fix 'make help' message error

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: default avatarJianyu Zhan <nasa4836@gmail.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1401727474-19370-1-git-send-email-nasa4836@gmail.comSigned-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent a515114f
...@@ -789,8 +789,8 @@ help: ...@@ -789,8 +789,8 @@ help:
@echo '' @echo ''
@echo 'Perf install targets:' @echo 'Perf install targets:'
@echo ' NOTE: documentation build requires asciidoc, xmlto packages to be installed' @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 ' HINT: use "prefix" or "DESTDIR" to install to a particular'
@echo ' path like make prefix=/usr/local install install-doc' @echo ' path like "make prefix=/usr/local install install-doc"'
@echo ' install - install compiled binaries' @echo ' install - install compiled binaries'
@echo ' install-doc - install *all* documentation' @echo ' install-doc - install *all* documentation'
@echo ' install-man - install manpage documentation' @echo ' install-man - install manpage documentation'
......
...@@ -600,7 +600,7 @@ endif ...@@ -600,7 +600,7 @@ endif
# Make the path relative to DESTDIR, not to prefix # Make the path relative to DESTDIR, not to prefix
ifndef DESTDIR ifndef DESTDIR
prefix = $(HOME) prefix ?= $(HOME)
endif endif
bindir_relative = bin bindir_relative = bin
bindir = $(prefix)/$(bindir_relative) bindir = $(prefix)/$(bindir_relative)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment