summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/opengl-update/files/opengl-update-2.1_pre7')
-rw-r--r--x11-base/opengl-update/files/opengl-update-2.1_pre713
1 files changed, 10 insertions, 3 deletions
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}