Install into correct libdir.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

5 files changed, 20 insertions, 13 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 1009b21ff6b3..1ba614a9c28c 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.72 2012/07/27 16:49:14 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.73 2012/07/27 20:06:32 aidecoe Exp $
+
+  27 Jul 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-014-r3.ebuild,
+  dracut-018-r2.ebuild, dracut-019-r2.ebuild, dracut-022.ebuild:
+  Install into correct libdir.
 
   27 Jul 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-022.ebuild:
   Export CC to emake and warn about optimization.
diff --git a/sys-kernel/dracut/dracut-014-r3.ebuild b/sys-kernel/dracut/dracut-014-r3.ebuild
index 0a04a5bb950c..2d82d4eda4f4 100644
--- a/sys-kernel/dracut/dracut-014-r3.ebuild
+++ b/sys-kernel/dracut/dracut-014-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-014-r3.ebuild,v 1.2 2012/07/26 18:05:06 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-014-r3.ebuild,v 1.3 2012/07/27 20:06:32 aidecoe Exp $
 
 EAPI=4
 
@@ -144,7 +144,7 @@ src_compile() {
 
 src_install() {
 	emake WITH_SWITCH_ROOT=0 \
-		prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
+		prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc DESTDIR="${D}" \
 		install
 
 	local gen2conf
@@ -168,7 +168,7 @@ src_install() {
 	# Modules
 	#
 	local module
-	modules_dir="${D}/usr/lib/dracut/modules.d"
+	modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
 
 	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
 		|| die 'dracut-version failed'
diff --git a/sys-kernel/dracut/dracut-018-r2.ebuild b/sys-kernel/dracut/dracut-018-r2.ebuild
index 8994ee26c63c..573cf9d66868 100644
--- a/sys-kernel/dracut/dracut-018-r2.ebuild
+++ b/sys-kernel/dracut/dracut-018-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-018-r2.ebuild,v 1.2 2012/07/26 18:05:06 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-018-r2.ebuild,v 1.3 2012/07/27 20:06:32 aidecoe Exp $
 
 EAPI=4
 
@@ -154,7 +154,8 @@ src_compile() {
 }
 
 src_install() {
-	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install
+	emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
+		DESTDIR="${D}" install
 
 	local gen2conf
 
@@ -179,7 +180,7 @@ src_install() {
 	# Modules
 	#
 	local module
-	modules_dir="${D}/usr/lib/dracut/modules.d"
+	modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
 
 	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
 		|| die 'dracut-version failed'
diff --git a/sys-kernel/dracut/dracut-019-r2.ebuild b/sys-kernel/dracut/dracut-019-r2.ebuild
index c6405bba75de..32a213f14457 100644
--- a/sys-kernel/dracut/dracut-019-r2.ebuild
+++ b/sys-kernel/dracut/dracut-019-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-019-r2.ebuild,v 1.2 2012/07/26 18:05:06 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-019-r2.ebuild,v 1.3 2012/07/27 20:06:32 aidecoe Exp $
 
 EAPI=4
 
@@ -153,7 +153,8 @@ src_compile() {
 }
 
 src_install() {
-	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install
+	emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
+		DESTDIR="${D}" install
 
 	local gen2conf
 
@@ -178,7 +179,7 @@ src_install() {
 	# Modules
 	#
 	local module
-	modules_dir="${D}/usr/lib/dracut/modules.d"
+	modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
 
 	# Remove modules not enabled by USE flags
 	for module in ${IUSE_DRACUT_MODULES} ; do
diff --git a/sys-kernel/dracut/dracut-022.ebuild b/sys-kernel/dracut/dracut-022.ebuild
index 36725701ef45..85ea801178d6 100644
--- a/sys-kernel/dracut/dracut-022.ebuild
+++ b/sys-kernel/dracut/dracut-022.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022.ebuild,v 1.5 2012/07/27 16:49:14 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022.ebuild,v 1.6 2012/07/27 20:06:32 aidecoe Exp $
 
 EAPI=4
 
@@ -169,7 +169,8 @@ src_compile() {
 }
 
 src_install() {
-	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install
+	emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
+		DESTDIR="${D}" install
 
 	dodir /var/lib/dracut/overlay
 	dodoc HACKING TODO AUTHORS NEWS README*
@@ -186,7 +187,7 @@ src_install() {
 	# Modules
 	#
 	local module
-	modules_dir="${D}/usr/lib/dracut/modules.d"
+	modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
 
 	# Remove modules not enabled by USE flags
 	for module in ${IUSE_DRACUT_MODULES} ; do