--- /usr/portage/eclass/kernel-mod.eclass	2004-10-06 15:05:41.000000000 -0700
+++ /usr/local/portage/eclass/kernel-mod.eclass	2005-05-08 09:16:54.000000000 -0700
@@ -15,6 +15,7 @@
 
 SRC_URI="${SRC_URI:-unknown - please fix me!!}"
 KERNEL_DIR="${KERNEL_DIR:-/usr/src/linux}"
+KBUILD_OUTPUT="${KBUILD_OUTPUT:-/usr/src/linux}"
 
 kernel-mod_getmakefilevar ()
 {
@@ -87,9 +88,9 @@
 
 kernel-mod_configoption_present ()
 {
-        [ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
+        [ -e "${KBUILD_OUTPUT}/.config" ] || die "kernel has not been configured yet"
 
-	if egrep "^CONFIG_${1}=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	if egrep "^CONFIG_${1}=[ym]" ${KBUILD_OUTPUT}/.config >/dev/null
 	then
 		return 0
 	else
@@ -99,9 +100,9 @@
 
 kernel-mod_configoption_module ()
 {
-	[ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
+	[ -e "${KBUILD_OUTPUT}/.config" ] || die "kernel has not been configured yet"
 
-	if egrep "^CONFIG_${1}=[m]" ${ROOT}/usr/src/linux/.config >/dev/null
+	if egrep "^CONFIG_${1}=[m]" ${KBUILD_OUTPUT}/.config >/dev/null
 	then
 		return 0
 	else
@@ -111,9 +112,9 @@
 
 kernel-mod_configoption_builtin ()
 {
-	[ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
+	[ -e "${KBUILD_OUTPUT}/.config" ] || die "kernel has not been configured yet"
 
-	if egrep "^CONFIG_${1}=[y]" ${ROOT}/usr/src/linux/.config >/dev/null
+	if egrep "^CONFIG_${1}=[y]" ${KBUILD_OUTPUT}/.config >/dev/null
 	then
 		return 0
 	else
@@ -140,7 +141,7 @@
 {
 	einfo "Checking for status of CONFIG_ZLIB_INFLATE support in your kernel"
 
-	. ${KERNEL_DIR}/.config || die "kernel has not been configured yet"
+	. ${KBUILD_OUTPUT}/.config || die "kernel has not been configured yet"
 	[ "$CONFIG_ZLIB_INFLATE" != "y" ] && kernel-mod_badconfig_zlib
 	[ "$CONFIG_ZLIB_DEFLATE" != "y" ] && kernel-mod_badconfig_zlib