perf: Make the install relative to DESTDIR if specified (7ae5f213) · Commits · 戴 / test

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>

tools/perf/Documentation/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

tools/perf/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message