diff options
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.0.0.ebuild | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index ab31d72ae560..18de376ecdd3 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.467 2008/04/19 06:22:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.468 2008/05/10 10:03:38 vapier Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog + 10 May 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild: + Install the Makefile into $D so that we can use it in pkg_preinst steps (for + binpkgs) #218877 by Kevin Cody Jr. + 19 Apr 2008; Mike Frysinger <vapier@gentoo.org> baselayout-2.0.0.ebuild: Detect and display users with non-existent shells #215698. diff --git a/sys-apps/baselayout/baselayout-2.0.0.ebuild b/sys-apps/baselayout/baselayout-2.0.0.ebuild index bf49e9edb75e..36ce441b3904 100644 --- a/sys-apps/baselayout/baselayout-2.0.0.ebuild +++ b/sys-apps/baselayout/baselayout-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.4 2008/04/19 06:22:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.5 2008/05/10 10:03:38 vapier Exp $ inherit multilib @@ -49,8 +49,9 @@ pkg_preinst() { ln -s "${lib}" "${ROOT}usr/local/lib" fi - emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" + emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem" fi + rm -f "${D}"/usr/share/${PN}/Makefile } src_install() { @@ -64,6 +65,10 @@ src_install() { install || die dodoc ChangeLog + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile || die + # Should this belong in another ebuild? Like say binutils? # List all the multilib libdirs in /etc/env/04multilib (only if they're # actually different from the normal |