diff options
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.12.4-r1.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-1.12.1 | 6 |
3 files changed, 14 insertions, 6 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index a1bcb6d9de47..2f757c165f66 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,15 @@ # 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.335 2006/08/04 13:46:55 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.336 2006/08/05 13:00:23 herbs Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog + 05 Aug 2006; Herbie Hopkins <herbs@gentoo.org> + baselayout-1.12.4-r1.ebuild: + Be consistent and use the same libdir for make and make install of the + baselayout utilities (was causing problems on no-symlink profiles). + *baselayout-1.12.4-r1 (04 Aug 2006) 04 Aug 2006; Roy Marples <uberlord@gentoo.org> diff --git a/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild index 35276d76b6e7..f8df82798a20 100644 --- a/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.4-r1.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.4-r1.ebuild,v 1.1 2006/08/04 13:46:55 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild,v 1.2 2006/08/05 13:00:23 herbs Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -383,8 +383,11 @@ src_install() { # # Install baselayout utilities # + local libdir="lib" + [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") + cd "${S}"/src - make DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die + make DESTDIR="${D}" LIBDIR="${libdir}" install || die # Hack to fix bug 9849, continued in pkg_postinst unkdir diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.1 b/sys-apps/baselayout/files/digest-baselayout-1.12.1 index a84e8c27e3e3..3d246268d4c3 100644 --- a/sys-apps/baselayout/files/digest-baselayout-1.12.1 +++ b/sys-apps/baselayout/files/digest-baselayout-1.12.1 @@ -1,3 +1,3 @@ -MD5 b7b750362e4f67209604620f321bc546 baselayout-1.12.1.tar.bz2 217878 -RMD160 bf29b30435c1a82f693472f2b011d6bf74b9194c baselayout-1.12.1.tar.bz2 217878 -SHA256 63bb66086aab5bd94068dda7b571f9dbb59cf0cbbeb563b418780690614cb75c baselayout-1.12.1.tar.bz2 217878 +MD5 a06d07824f5b619403020288b392b27b baselayout-1.12.1.tar.bz2 215516 +RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 baselayout-1.12.1.tar.bz2 215516 +SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5 baselayout-1.12.1.tar.bz2 215516 |