diff options
author | John Kacur <jkacur@redhat.com> | 2010-03-11 07:57:00 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-11 08:08:11 -0500 |
commit | 7ae5f21361fea11f58c398701da635f778635d13 (patch) | |
tree | f6bcf809f93ef4133f4edb9e8f0fa770aacde9a7 /tools/perf/Documentation | |
parent | 83ff56f46a8532488ee364bb93a9cb2a59490d33 (diff) |
perf: Make the install relative to DESTDIR if specified
Without this change, the install path is relative to
prefix/DESTDIR where prefix is automatically set to $HOME.
This can produce unexpected results. For example:
make -C tools/perf DESTDIR=/home/jkacur/tmp install-man
creates the directory: /home/jkacur/home/jkacur/tmp/share/...
instead of the expected: /home/jkacur/tmp/share/...
Signed-off-by: John Kacur <jkacur@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Kyle McMartin <kyle@redhat.com>
Cc: <stable@kernel.org>
LKML-Reference: <1268312220-12880-1-git-send-email-jkacur@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/Documentation')
-rw-r--r-- | tools/perf/Documentation/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index bdd3b7ecad0a..bd498d496952 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile | |||
@@ -24,7 +24,10 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT)) | |||
24 | DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT)) | 24 | DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT)) |
25 | DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) | 25 | DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) |
26 | 26 | ||
27 | # Make the path relative to DESTDIR, not prefix | ||
28 | ifndef DESTDIR | ||
27 | prefix?=$(HOME) | 29 | prefix?=$(HOME) |
30 | endif | ||
28 | bindir?=$(prefix)/bin | 31 | bindir?=$(prefix)/bin |
29 | htmldir?=$(prefix)/share/doc/perf-doc | 32 | htmldir?=$(prefix)/share/doc/perf-doc |
30 | pdfdir?=$(prefix)/share/doc/perf-doc | 33 | pdfdir?=$(prefix)/share/doc/perf-doc |
@@ -32,7 +35,6 @@ mandir?=$(prefix)/share/man | |||
32 | man1dir=$(mandir)/man1 | 35 | man1dir=$(mandir)/man1 |
33 | man5dir=$(mandir)/man5 | 36 | man5dir=$(mandir)/man5 |
34 | man7dir=$(mandir)/man7 | 37 | man7dir=$(mandir)/man7 |
35 | # DESTDIR= | ||
36 | 38 | ||
37 | ASCIIDOC=asciidoc | 39 | ASCIIDOC=asciidoc |
38 | ASCIIDOC_EXTRA = --unsafe | 40 | ASCIIDOC_EXTRA = --unsafe |