summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-05-17 09:13:20 +0000
committerRoy Marples <uberlord@gentoo.org>2006-05-17 09:13:20 +0000
commit9df3b7a04a6b8507a66f64687d5ae9803d2f6419 (patch)
tree73e7ba7c3589783839e0d6b7f3c3bb16726734dc /sys-apps
parentFix bug #133444. (diff)
downloadgentoo-2-9df3b7a04a6b8507a66f64687d5ae9803d2f6419.tar.gz
gentoo-2-9df3b7a04a6b8507a66f64687d5ae9803d2f6419.tar.bz2
gentoo-2-9df3b7a04a6b8507a66f64687d5ae9803d2f6419.zip
Multilib fixes, #133547 thanks to Jonathan Coome.
(Portage version: 2.1_rc1-r2)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/baselayout/ChangeLog6
-rw-r--r--sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 872c5f2e5e4c..fad31361e7cb 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.326 2006/05/04 09:18:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.327 2006/05/17 09:13:20 uberlord Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 17 May 2006; Roy Marples <uberlord@gentoo.org>
+ baselayout-1.12.0_pre19-r2.ebuild:
+ Multilib fixes, #133547 thanks to Jonathan Coome.
+
*baselayout-1.12.0_pre19-r2 (04 May 2006)
*baselayout-1.11.15-r3 (04 May 2006)
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
index 358c374bffd5..7861e7dbbd2a 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild,v 1.1 2006/05/04 09:18:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild,v 1.2 2006/05/17 09:13:20 uberlord Exp $
inherit flag-o-matic eutils toolchain-funcs multilib
@@ -250,8 +250,8 @@ src_install() {
ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
fi
- kdir /lib/dev-state
- kdir /lib/udev-state
+ kdir /$(get_libdir)/dev-state
+ kdir /$(get_libdir)/udev-state
# FHS compatibility symlinks stuff
ksym /var/tmp /usr/tmp
@@ -385,7 +385,7 @@ src_install() {
# Install baselayout utilities
#
cd "${S}"/src
- make DESTDIR="${D}" install || die
+ make DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die
# Hack to fix bug 9849, continued in pkg_postinst
unkdir