diff options
| -rw-r--r-- | sys-devel/make/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-devel/make/make-3.80-r4.ebuild | 24 | ||||
| -rw-r--r-- | sys-devel/make/make-3.81.ebuild | 6 |
3 files changed, 17 insertions, 21 deletions
diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog index ccf12f11ac22..a30dde0b4d40 100644 --- a/sys-devel/make/ChangeLog +++ b/sys-devel/make/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/make -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.59 2006/11/05 12:12:43 vapier Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.60 2008/12/07 03:18:17 vapier Exp $ + + 07 Dec 2008; Mike Frysinger <vapier@gentoo.org> make-3.80-r4.ebuild, + make-3.81.ebuild: + Switch to emake in src_install and drop USE=build cruft. 05 Nov 2006; Mike Frysinger <vapier@gentoo.org> +files/make-3.81-tests-lang.patch, make-3.81.ebuild: diff --git a/sys-devel/make/make-3.80-r4.ebuild b/sys-devel/make/make-3.80-r4.ebuild index a8b174aa5d3a..e49a3104f364 100644 --- a/sys-devel/make/make-3.80-r4.ebuild +++ b/sys-devel/make/make-3.80-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r4.ebuild,v 1.10 2006/04/14 23:05:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r4.ebuild,v 1.11 2008/12/07 03:18:17 vapier Exp $ inherit eutils flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnu.org/gnu/make/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="nls static build" +IUSE="nls static" DEPEND="nls? ( sys-devel/gettext )" RDEPEND="" @@ -34,18 +34,10 @@ src_compile() { } src_install() { - if use build ; then - if [[ ${USERLAND} == "GNU" ]] ; then - dobin make || die "dobin" - else - newbin make gmake || die "newbin failed" - fi - else - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README* - if [[ ${USERLAND} == "GNU" ]] ; then - dosym gmake /usr/bin/make - dosym gmake.1 /usr/share/man/man1/make.1 - fi + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog NEWS README* + if [[ ${USERLAND} == "GNU" ]] ; then + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 fi } diff --git a/sys-devel/make/make-3.81.ebuild b/sys-devel/make/make-3.81.ebuild index 8466ab32eb4c..a0ebd601454b 100644 --- a/sys-devel/make/make-3.81.ebuild +++ b/sys-devel/make/make-3.81.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81.ebuild,v 1.12 2006/11/05 12:12:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81.ebuild,v 1.13 2008/12/07 03:18:17 vapier Exp $ inherit flag-o-matic @@ -32,7 +32,7 @@ src_compile() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS ChangeLog NEWS README* if [[ ${USERLAND} == "GNU" ]] ; then # we install everywhere as 'gmake' but on GNU systems, |