From d19f7ed1a4926106bee3a110e3763ba64926f7a8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 18 Dec 2018 17:18:46 +0000 Subject: [PATCH] linux-perf: Fix installation directories for BPF headers and examples Closes: #916774 --- debian/changelog | 2 ++ debian/rules.d/tools/perf/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c08ebe27d..e36bd627c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ linux (4.19.9-2) UNRELEASED; urgency=medium [ Ben Hutchings ] * linux-perf: Fix build-time check for unversioned files + * linux-perf: Fix installation directories for BPF headers and examples + (Closes: #916774) -- Uwe Kleine-König Mon, 17 Dec 2018 11:27:32 +0100 diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile index 41e07feb1..35de916c8 100644 --- a/debian/rules.d/tools/perf/Makefile +++ b/debian/rules.d/tools/perf/Makefile @@ -22,7 +22,7 @@ MAKE_PERF := $(MAKE) O=$(CURDIR) prefix=/usr V=1 VF=1 ARCH=$(KERNEL_ARCH) WERROR MAKE_PERF += NO_GTK2=1 # Include version in all directory names -MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups tipdir=share/doc/linux-perf-$(VERSION) +MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups tipdir=share/doc/linux-perf-$(VERSION) perf_include_dir=include/perf_$(VERSION) perf_examples_dir=share/doc/linux-perf-$(VERSION)/examples # perf can link against libbfd if available, but the result is # undistributable as they are licenced under GPL v2 and v3+