From 0c22e019be3ae4fd1ae023f9452505a47cb5e232 Mon Sep 17 00:00:00 2001
From: Volker Uhrig
Date: Thu, 28 Aug 2008 10:51:10 +0000
Subject: * minor fixes   * ati and nvidia compile under suse-10.2   * ati and
 nvidia don't compile under ubuntu 8.04     and needs a special setup
 (gcc-4.1)   * other vendorOSes where not tested

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2116 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/files/ati-install.sh    | 2 +-
 os-plugins/plugins/xserver/files/nvidia-install.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/os-plugins/plugins/xserver/files/ati-install.sh b/os-plugins/plugins/xserver/files/ati-install.sh
index 5fd975bc..8ead3b63 100755
--- a/os-plugins/plugins/xserver/files/ati-install.sh
+++ b/os-plugins/plugins/xserver/files/ati-install.sh
@@ -42,7 +42,7 @@ cp 2.6.x/Makefile .
 uname_r=$(find /lib/modules/2.6* -maxdepth 0|sed 's,/lib/modules/,,g'|sort|tail -n1)
 sed -i "s,^KVER.*$,KVER = ${uname_r}," Makefile
 # TODO: less verbose
-make -C /lib/modules/2.6.18.8-0.9-bigsmp/build M=$(pwd) GCC_VER_MAJ=${GCC_VERSION}
+make -C /lib/modules/${uname_r}/build M=$(pwd) GCC_VER_MAJ=${GCC_VERSION}
 
 cd /opt/openslx/plugin-repo/xserver/ati
 
diff --git a/os-plugins/plugins/xserver/files/nvidia-install.sh b/os-plugins/plugins/xserver/files/nvidia-install.sh
index 2439f5a3..b07cd457 100755
--- a/os-plugins/plugins/xserver/files/nvidia-install.sh
+++ b/os-plugins/plugins/xserver/files/nvidia-install.sh
@@ -19,7 +19,8 @@ cd ${TMP_FOLDER}
 ${PKG_FOLDER}/${FILE} -x > /dev/null
 #todo: check if it extracted like it should...
 
-NVPATH=${TMP_FOLDER}/${FILE/.run/}
+FILEPATH=$(echo ${FILE}|sed 's/.run//')
+NVPATH="${TMP_FOLDER}/${FILEPATH}"
 mv "${NVPATH}/usr" "${PLUGIN_PATH}/nvidia"
 
 echo "  * prepare kernel module"
-- 
cgit v1.2.3-55-g7522