summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Wissler2008-09-29 19:32:22 +0200
committerBastian Wissler2008-09-29 19:32:22 +0200
commit4301eb3ced2d674d8ec78645b7067264ccfc40c9 (patch)
treebf0a885297ad2631279001b22484f3a33898253a
parentxserver: *added suse-11.0 support (partial) for binary x11-drivers (diff)
downloadcore-4301eb3ced2d674d8ec78645b7067264ccfc40c9.tar.gz
core-4301eb3ced2d674d8ec78645b7067264ccfc40c9.tar.xz
core-4301eb3ced2d674d8ec78645b7067264ccfc40c9.zip
xserver: fixes to linkage.sh for the only conflicting lib at the moment
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2256 95ad53e4-c205-0410-b2fa-d234c58c8868
-rwxr-xr-xos-plugins/plugins/xserver/files/linkage.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/os-plugins/plugins/xserver/files/linkage.sh b/os-plugins/plugins/xserver/files/linkage.sh
index b607ce08..4c9aad6d 100755
--- a/os-plugins/plugins/xserver/files/linkage.sh
+++ b/os-plugins/plugins/xserver/files/linkage.sh
@@ -162,16 +162,22 @@ fi
if [ "$1" = "both" ]; then
divert $NVROOT $ATIROOT
divert $ATIROOT $NVROOT
+ ln -sf /var/X11R6/lib/libGL.so.1 /usr/lib/libGL.so.1
+ ln -sf /var/X11R6/lib/libGL.so.1 /usr/lib/libGL.so
exit
fi
if [ "$1" = "nvidia" ]; then
divert ${NVROOT}
+ ln -sf /var/X11R6/lib/libGL.so.1 /usr/lib/libGL.so.1
+ ln -sf /var/X11R6/lib/libGL.so.1 /usr/lib/libGL.so
exit
fi
if [ "$1" = "ati" ]; then
divert ${ATIROOT}
+ ln -sf /var/X11R6/lib/libGL.so.1 /usr/lib/libGL.so.1
+ ln -sf /var/X11R6/lib/libGL.so.1 /usr/lib/libGL.so
exit
fi