diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-11-11 18:49:45 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-11-11 18:49:45 +0000 |
| commit | 88cc1d0d9272f85b4b382eb3cdf1bf97e0cb674f (patch) | |
| tree | 6103242b2ac053223069587cab8aa0a7fbe0ca54 /media-video | |
| parent | Bump for 7.0RC2. (diff) | |
| download | gentoo-2-88cc1d0d9272f85b4b382eb3cdf1bf97e0cb674f.tar.gz gentoo-2-88cc1d0d9272f85b4b382eb3cdf1bf97e0cb674f.tar.bz2 gentoo-2-88cc1d0d9272f85b4b382eb3cdf1bf97e0cb674f.zip | |
Small tweak to last commit.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild index 5d347a3b5af6..53f3af25c347 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild,v 1.1 2005/11/11 18:41:55 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild,v 1.2 2005/11/11 18:49:45 azarah Exp $ inherit eutils multilib versionator @@ -250,13 +250,15 @@ src_install-libs() { pkg_preinst() { # Can we make up our minds ?!?!? - [[ -n ${IMAGE} ]] && D=${IMAGE} + [[ -n ${IMAGE} ]] && \ + NV_D="${IMAGE}" || \ + NV_D="${D}" if ! has_version x11-base/xorg-server ; then for dir in lib lib32 lib64 ; do - if [[ -d ${D}/usr/${dir}/xorg ]] ; then - mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} - rmdir ${D}/usr/${dir}/xorg + if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then + mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir} + rmdir ${NV_D}/usr/${dir}/xorg fi done fi @@ -265,9 +267,9 @@ pkg_preinst() { # Since we moved away from libs in /usr/X11R6 need to check this if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ has_version "x11-base/xfree86" ; then - mkdir -p ${D}/usr/X11R6 + mkdir -p ${NV_D}/usr/X11R6 for dir in lib lib32 lib64 ; do - [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + [[ -d ${NV_D}/usr/${dir} ]] && mv ${NV_D}/usr/${dir} ${NV_D}/usr/X11R6 done fi |