diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-10-19 08:00:00 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-10-19 08:00:00 +0000 |
| commit | ecb14815718f6a3cac08964a1152a0f78a90b6d1 (patch) | |
| tree | 7aff21f97bd2ff2edeeecf47db4b0b764496090d /x11-base | |
| parent | Stable on amd64. (Manifest recommit) (diff) | |
| download | gentoo-2-ecb14815718f6a3cac08964a1152a0f78a90b6d1.tar.gz gentoo-2-ecb14815718f6a3cac08964a1152a0f78a90b6d1.tar.bz2 gentoo-2-ecb14815718f6a3cac08964a1152a0f78a90b6d1.zip | |
Add die messages. Also try emake -C instead of moving into a dir, make, then moving out.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild | 22 |
2 files changed, 16 insertions, 13 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 5d031213d462..73d2ed519caa 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.166 2004/10/19 07:53:08 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.167 2004/10/19 08:00:00 spyderous Exp $ + + 19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.0-r2.ebuild: + Add die messages. Also try emake -C instead of moving into a dir, make, then + moving out. 19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.0-r2.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild index 23f84b9b5ff1..ade860b42052 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.23 2004/10/19 07:53:08 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.24 2004/10/19 08:00:00 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -247,7 +247,7 @@ host_def_setup() { HOSTCONF=config/cf/host.def ebegin "Setting up ${HOSTCONF}" - cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} || die + cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} || die "host.def copy failed" echo "#define XVendorString \"Gentoo Linux (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \ >> ${HOSTCONF} @@ -686,16 +686,14 @@ src_compile() { if use debug then chmod u+x ${S}/config/util/makeg.sh - FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" || die + FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" || die "debug make World failed" else - FAST=1 emake World WORLDOPTS="" || die + FAST=1 emake World WORLDOPTS="" || die "make World failed" fi if use nls then - cd ${S}/nls - make || die - cd ${S} + emake -C ${S}/nls || die "nls build failed" fi } @@ -968,26 +966,26 @@ src_install() { make install DESTDIR=${D} || \ make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install DESTDIR=${D} || die + install DESTDIR=${D} || die "install failed" else - make install DESTDIR=${D} || die + make install DESTDIR=${D} || die "install failed" fi if use sdk then einfo "Installing X.org X11 SDK..." - make install.sdk DESTDIR=${D} || die + make install.sdk DESTDIR=${D} || die "sdk install failed" fi einfo "Installing man pages..." - make install.man DESTDIR=${D} || die + make install.man DESTDIR=${D} || die "man page install failed" einfo "Compressing man pages..." prepman /usr if use nls then cd ${S}/nls - make DESTDIR=${D} install || die + make DESTDIR=${D} install || die "nls install failed" fi backward_compat_setup |