Bypass the new and buggy tools/perf/Makefile in favour of Makefile.perf

Somehow this new wrapper manages to reduce the priority of our
'prefix' setting.  That interacts with the insane way prefix is
defaulted in config/Makefile so that the prefix is wrong at build time
but right at install time (resulting in a rebuild then!).

Also the wrapper replaces our -j option and we would have to set JOBS
instead.

The perf makefiles never get better, just different...

svn path=/dists/trunk/linux-tools/; revision=20994
This commit is contained in:
Ben Hutchings 2014-01-21 06:33:13 +00:00
parent 09bd3a69be
commit 8cad86b947
1 changed files with 2 additions and 2 deletions

View File

@ -42,13 +42,13 @@ MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=
all:
ifdef KERNEL_ARCH_PERF
-mkdir out
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out all VERSION=$(VERSION)
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf -f Makefile.perf O=$(CURDIR)/out all VERSION=$(VERSION)
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf/Documentation O=$(CURDIR)/out man VERSION=$(VERSION)
endif
install:
ifdef KERNEL_ARCH_PERF
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out install VERSION=$(VERSION)
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf -f Makefile.perf O=$(CURDIR)/out install VERSION=$(VERSION)
endif
clean: