From: Robin H. Johnson <robbat2@gentoo.org>
Date: Sat, 22 Aug 2015 20:27:46 +0000 (-0700)
Subject: Fix turbostat build & install.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d5da422b82e6f9078d263094d9d40c3e7f630aee;p=gentoo.git

Fix turbostat build & install.

Package-Manager: portage-2.2.18
---

diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
index be86d16228a7..43f20ad32a27 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic
+inherit versionator eutils toolchain-funcs linux-info flag-o-matic
 
 DESCRIPTION="Misc tools bundled with kernel sources"
 HOMEPAGE="http://kernel.org/"
@@ -69,7 +69,7 @@ TARGETS_SIMPLE=(
 # These have a broken make install, no DESTDIR
 TARGET_MAKE_SIMPLE=(
 	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:../../../../turbostat
+	tools/power/x86/turbostat:turbostat:../../../../turbostat
 	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
 	Documentation/misc-devices/mei:mei-amt-version
 )
@@ -133,8 +133,10 @@ src_compile() {
 	done
 
 	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Building $dir => $target"
+		dir=${t/:*} target_binfile=${t#*:}
+		target=${target_binfile/:*} binfile=${target_binfile/*:}
+		[ -z "${binfile}" ] && binfile=$target
+		einfo "Building $dir => $binfile (via emake $target)"
 		emake -C $dir ARCH=${karch} $target
 	done
 }
@@ -148,9 +150,11 @@ src_install() {
 	done
 
 	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Installing $dir => $target"
-		dosbin ${dir}/${target}
+		dir=${t/:*} target_binfile=${t#*:}
+		target=${target_binfile/:*} binfile=${target_binfile/*:}
+		[ -z "${binfile}" ] && binfile=$target
+		einfo "Installing $dir => $binfile"
+		dosbin ${dir}/${binfile}
 	done
 
 	newconfd "${FILESDIR}"/freefall.confd freefall