From 4301eb3ced2d674d8ec78645b7067264ccfc40c9 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Mon, 29 Sep 2008 17:32:22 +0000
Subject: 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
---
 os-plugins/plugins/xserver/files/linkage.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'os-plugins')

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
 
-- 
cgit v1.2.3-55-g7522