Makefile: Fix the build issues with perf messing up the built modules.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index fb3fc0506e8d14a43e34950e388e5bbc79ea3ecd..13b6fd9b8a5cc3c0df7afcccd4b69d2ea6b0e154 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -188,7 +188,7 @@ distdir:
 # This target includes all userspace tools and images
 # It does not include the Linux drivers/modules found in the modulespace target
 .PHONY:        root_image-userspace-install
-root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install pm-utils-install cpufrequtils-install kexec-tools-install perf-install oprofile-install
+root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install pm-utils-install cpufrequtils-install kexec-tools-install oprofile-install perf-install power-install
 
        rm -rf userspace/man
        rm -rf userspace/usr/share/man
@@ -820,11 +820,13 @@ perf-depend:
 
 .PHONY: perf-install
 perf-install: perf-depend
-       $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) V=1 NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST) perf_install
+       mkdir -p $(LINUX_DST)/tools
+       $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) V=1 NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST)/tools perf_install
 
 .PHONY: power-install
 power-install: power-depend
-       $(MAKE) $(MFLAGS) V=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST) cpupower_install
+       mkdir -p $(LINUX_DST)/tools
+       $(MAKE) $(MFLAGS) V=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST)/tools cpupower_install
 ifeq ($(RPM_ARCH), x86_64)
        (cd userspace/usr$(LIBSDIR); ln -fs  ../lib/libcpupower.so.0)
 endif