diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-08 10:38:59 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-08 10:38:59 +0000 |
| commit | 7f71fde7562eaa1c6d3fa5c2a6f7b208418ca514 (patch) | |
| tree | ca850fa583811b4fcf5b2a896bb2b35cf982433a /x11-base | |
| parent | Remove dep on flex (#80866). (diff) | |
| download | historical-7f71fde7562eaa1c6d3fa5c2a6f7b208418ca514.tar.gz historical-7f71fde7562eaa1c6d3fa5c2a6f7b208418ca514.tar.bz2 historical-7f71fde7562eaa1c6d3fa5c2a6f7b208418ca514.zip | |
Added an extra sanity check for --prefix and --dst-prefix.
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/opengl-update/Manifest | 8 | ||||
| -rw-r--r-- | x11-base/opengl-update/files/opengl-update-2.1_pre7 | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest index b380c0ca975b..9246dab0320e 100644 --- a/x11-base/opengl-update/Manifest +++ b/x11-base/opengl-update/Manifest @@ -25,12 +25,12 @@ MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre5 64 MD5 f21996de10b91b58cced8fbcc6c44792 files/opengl-update-2.0_pre5 9738 MD5 cf5944150fa11c202f013103cd362c9b files/opengl-update-2.1_pre6 7792 MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1_pre6 116 -MD5 a3191c8989b8d00551856a0dc822452f files/opengl-update-2.1_pre7 8856 +MD5 d3bfde1a7b5ba1869ecb07b412e7cc2a files/opengl-update-2.1_pre7 9040 MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1_pre7 116 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCCI/xArHZZzCEUG0RAoOtAJ0WiXa9i3qXdx3EJfKLFvhgKMxZiQCgh5ku -jlyvEN1fiyuVhCRpJSknVb8= -=ghv3 +iD8DBQFCCJbPArHZZzCEUG0RAu1eAJ0f+8DFcLmwpqEmXqtZ8HcfqIZNrwCeLpq5 +ScFoHjJIWMISP5H+nQepSGg= +=byZt -----END PGP SIGNATURE----- diff --git a/x11-base/opengl-update/files/opengl-update-2.1_pre7 b/x11-base/opengl-update/files/opengl-update-2.1_pre7 index 28f670a8990b..0ecfc0bbaecf 100644 --- a/x11-base/opengl-update/files/opengl-update-2.1_pre7 +++ b/x11-base/opengl-update/files/opengl-update-2.1_pre7 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre7,v 1.1 2005/02/08 10:09:12 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre7,v 1.2 2005/02/08 10:38:59 eradicator Exp $ # Author: Martin Schlemmer <azarah@gentoo.org> # Further modifications by Donnie Berkholz <spyderous@gentoo.org> # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org> @@ -162,6 +162,11 @@ set-new-implementation() { check_version + if ! hasq ${GL_IMPLEM} ${AVAIL_IMPLEMS}; then + eerror "Invalid profile selected." + exit 1 + fi + ebegin "Switching to ${GL_IMPLEM} OpenGL interface" rm -f ${ENV_D} &> /dev/null @@ -260,8 +265,10 @@ set-new-implementation() { fi # Setup the includes - mkdir -p ${DST_PREFIX}/X11R6/include/GL - pushd ${DST_PREFIX}/X11R6/include/GL &> /dev/null + # Hack until /usr/X11R6 is gone... + [[ ${DST_PREFIX} == "/usr" ]] && DST_PREFIX="/usr/X11R6" + mkdir -p ${DST_PREFIX}/include/GL + pushd ${DST_PREFIX}/include/GL &> /dev/null for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do [[ -f "${file}" ]] && rm -f ${file} |