--- trunk/include/kernel.sminc 2012/03/04 14:16:15 11369 +++ trunk/include/kernel.sminc 2012/07/01 18:50:25 12741 @@ -192,7 +192,7 @@ minstalldir /boot || die # install modules - make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR} modules_install || die + make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR}/usr modules_install || die # install kernelimage if [[ -z ${KERNEL_IMAGE_PATH} ]] @@ -236,31 +236,31 @@ || die # fix build symlink - if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build ] + if [ -L ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build ] then echo "fixing build symlink" - rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die + rm ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \ - /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \ + /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \ || die fi # and fixing source symlink - if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source ] + if [ -L ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source ] then echo "fixing source symlink" - rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die + rm ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \ - /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \ + /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \ || die fi # remove firmware bits if $LINUX_FIRMWARE was set if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]] then - if [[ -d ${BINDIR}/lib/firmware ]] + if [[ -d ${BINDIR}/usr/lib/firmware ]] then - rm -rv ${BINDIR}/lib/firmware + rm -rv ${BINDIR}/usr/lib/firmware fi fi