--- trunk/virtualbox/vboxvideo.sh	2010/08/22 18:37:54	1115
+++ trunk/virtualbox/vboxvideo.sh	2010/08/22 18:40:26	1116
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /root/magellan-cvs/src/virtualbox/vboxvideo.sh,v 1.1 2010-08-09 20:31:47 niro Exp $
+# $Header: /root/magellan-cvs/src/virtualbox/vboxvideo.sh,v 1.2 2010-08-22 18:40:26 niro Exp $
 # Compiles vboxvideo drm module for given kernel
 
 die() { echo -e "${COLRED}$@${COLDEFAULT}"; exit 1; }
@@ -76,7 +76,7 @@
 # some sane defaults
 [[ -z ${KERNEL_VERSION} ]] && KERNEL_VERSION="$(uname -r)"
 [[ -z ${KERNEL_SOURCES} ]] && KERNEL_SOURCES="/lib/modules/${KERNEL_VERSION}/source"
-KERNEL_MODULE_DEST="/lib/modules/${KERNEL_VERSION}/video"
+KERNEL_MODULE_DEST="/lib/modules/${KERNEL_VERSION}/misc"
 KERNEL_MODULE_SUFFIX="$(mod_suffix ${KERNEL_SOURCES})"
 
 if [[ -f ${KERNEL_MODULE_DEST}/${KERNEL_MODULE}.${KERNEL_MODULE_SUFFIX} ]]
@@ -96,16 +96,13 @@
 cd ${SRCDIR}
 
 mecho "Compiling ${KERNEL_MODULE}-module for kernel ${KERNEL_VERSION} ..."
-gcc_major="$(gcc --version | grep gcc | cut -d' ' -f3|cut -d. -f1)"
-export _POSIX2_VERSION="199209"
-[[ $(kernel_major_version ${KERNEL_SOURCES}) = 2.6 ]] && cp 2.6.x/Makefile ${SRCDIR}
-make -C ${KERNEL_SOURCES} V=0 M="$(pwd)" GCC_VER_MAJ="${gcc_major}" modules || die
+make -C ${KERNEL_SOURCES} V=0 M="$(pwd)" modules || die
 
 mecho "Installing ${KERNEL_MODULE}-module into ${KERNEL_MODULE_DEST} ..."
 install -d ${KERNEL_MODULE_DEST} || die
 install -m0644 ${KERNEL_MODULE}.${KERNEL_MODULE_SUFFIX} ${KERNEL_MODULE_DEST} || die
 
 mecho "Calculating module dependencies ..."
-depmod -ae ${KERNEL_VERSION}
+depmod -a ${KERNEL_VERSION}
 
 exit 0