diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2007-11-13 22:24:35 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2007-11-13 22:24:35 +0000 |
| commit | 26854ae80169b4f4b25ee6ae4d04b49d8d6a8103 (patch) | |
| tree | 1555106da15b75c9728440751bdaef2ac607b971 | |
| parent | Added a small fix for bug #111972 and also doing some minor clean up. (diff) | |
| download | livecd-tools-26854ae80169b4f4b25ee6ae4d04b49d8d6a8103.tar.gz livecd-tools-26854ae80169b4f4b25ee6ae4d04b49d8d6a8103.tar.bz2 livecd-tools-26854ae80169b4f4b25ee6ae4d04b49d8d6a8103.zip | |
Removed code from the old xfree->xorg-x11 changeover.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@134 7bf51bff-881f-0410-a643-fba68b97345e
| -rwxr-xr-x | openglify | 31 |
1 files changed, 10 insertions, 21 deletions
@@ -1,6 +1,6 @@ #!/bin/bash -# This script is designed to tweak the system for eselect-opengl/opengl-update. +# This script is designed to tweak the system for eselect-opengl # move symlinks to a malleable /etc/opengl directory. install -d test/lib/modules/extensions @@ -8,15 +8,17 @@ install -d test/lib/modules/extensions # First, we remove all of the symlinks, so we can point them to our own # /etc/opengl directory rm -f /usr/lib*/libGL{,core}.{a,so}* > /dev/null 2>&1 -rm -f /usr/lib*/modules/extensions/libglx* > /dev/null 2>&1 rm -f /usr/lib*/xorg/modules/extensions/libglx* > /dev/null 2>&1 # We start with the "default" libdir of /usr/lib -ln -sf /etc/opengl/lib/libGL.so /usr/lib/libGL.so -ln -sf /etc/opengl/lib/libGL.so.1 /usr/lib/libGL.so.1 -ln -sf /etc/opengl/lib/libGLcore.so /usr/lib/libGLcore.so -ln -sf /etc/opengl/lib/libGLcore.so.1 /usr/lib/libGLcore.so.1 -ln -sf /etc/opengl/lib/libGL.la /usr/lib/libGL.la +if [ ! -h /usr/lib ] +then + ln -sf /etc/opengl/lib/libGL.so /usr/lib/libGL.so + ln -sf /etc/opengl/lib/libGL.so.1 /usr/lib/libGL.so.1 + ln -sf /etc/opengl/lib/libGLcore.so /usr/lib/libGLcore.so + ln -sf /etc/opengl/lib/libGLcore.so.1 /usr/lib/libGLcore.so.1 + ln -sf /etc/opengl/lib/libGL.la /usr/lib/libGL.la +fi # We then check for /usr/lib32 if [ -d /usr/lib32 ] @@ -29,20 +31,7 @@ then fi # We create symlinks fo the libglx.so and libglx.a -if [ -d /usr/lib/modules/extensions ] -then - ln -sf /etc/opengl/lib/modules/extensions/libglx.so \ - /usr/lib/modules/extensions/libglx.so - ln -sf /etc/opengl/lib/modules/extensions/libglx.a \ - /usr/lib/modules/extensions/libglx.a - if [ -d /usr/lib32 ] - then - ln -sf /etc/opengl/lib32/modules/extensions/libglx.so \ - /usr/lib32/modules/extensions/libglx.so - ln -sf /etc/opengl/lib32/modules/extensions/libglx.a \ - /usr/lib32/modules/extensions/libglx.a - fi -elif [ -d /usr/lib/xorg/modules/extensions ] +if [ -d /usr/lib/xorg/modules/extensions ] then ln -sf /etc/opengl/lib/modules/extensions/libglx.so \ /usr/lib/xorg/modules/extensions/libglx.so |