From b214cde534e81cfc5c54f5ef4ab1c02a95ee5057 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Thu, 11 Mar 2010 13:57:00 +0100
Subject: [PATCH] --- yaml --- r: 188275 b: refs/heads/master c:
 7ae5f21361fea11f58c398701da635f778635d13 h: refs/heads/master i:   188273:
 81b7e143bb9057bc7bd1eeaf196ee4d5262656f2   188271:
 058b65511cbee019882e56435fc331256046be85 v: v3

---
 [refs]                                  | 2 +-
 trunk/tools/perf/Documentation/Makefile | 4 +++-
 trunk/tools/perf/Makefile               | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fac180293aad..7387a65caaf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83ff56f46a8532488ee364bb93a9cb2a59490d33
+refs/heads/master: 7ae5f21361fea11f58c398701da635f778635d13
diff --git a/trunk/tools/perf/Documentation/Makefile b/trunk/tools/perf/Documentation/Makefile
index bdd3b7ecad0a..bd498d496952 100644
--- a/trunk/tools/perf/Documentation/Makefile
+++ b/trunk/tools/perf/Documentation/Makefile
@@ -24,7 +24,10 @@ DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 
+# Make the path relative to DESTDIR, not prefix
+ifndef DESTDIR
 prefix?=$(HOME)
+endif
 bindir?=$(prefix)/bin
 htmldir?=$(prefix)/share/doc/perf-doc
 pdfdir?=$(prefix)/share/doc/perf-doc
@@ -32,7 +35,6 @@ mandir?=$(prefix)/share/man
 man1dir=$(mandir)/man1
 man5dir=$(mandir)/man5
 man7dir=$(mandir)/man7
-# DESTDIR=
 
 ASCIIDOC=asciidoc
 ASCIIDOC_EXTRA = --unsafe
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index 5840499e2d22..8a8f52db7e38 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -216,7 +216,10 @@ STRIP ?= strip
 # runtime figures out where they are based on the path to the executable.
 # This can help installing the suite in a relocatable way.
 
+# Make the path relative to DESTDIR, not to prefix
+ifndef DESTDIR
 prefix = $(HOME)
+endif
 bindir_relative = bin
 bindir = $(prefix)/$(bindir_relative)
 mandir = share/man
@@ -233,7 +236,6 @@ sysconfdir = $(prefix)/etc
 ETC_PERFCONFIG = etc/perfconfig
 endif
 lib = lib
-# DESTDIR=
 
 export prefix bindir sharedir sysconfdir