From e9cd4b38cc72a9da9a0065117c7687f861274bc0 Mon Sep 17 00:00:00 2001
From: John Mylchreest <johnm@gentoo.org>
Date: Sun, 26 Feb 2006 17:14:36 +0000
Subject: Fixes bug #113614, thanks go to: Max Loparyev & Ben Peddell

---
 eclass/kernel-2.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'eclass')

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index a6114e2c5012..abe7634e9c91 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.159 2006/02/17 22:18:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.160 2006/02/26 17:14:36 johnm Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -326,6 +326,11 @@ unpack_2_6() {
 	env_setup_xmakeopts
 
 	cd "${S}"
+	
+	# since KBUILD_OUTPUT should only be used on the active kernel
+	# sources, we should unset it here.
+	[[ -n "${KBUILD_OUTPUT}" ]] && unset KBUILD_OUTPUT
+	
 	# this file is required for other things to build properly, so we
 	# autogenerate it ... touch .config to keep version.h build from
 	# spitting out an annoying warning
@@ -419,7 +424,7 @@ compile_headers() {
 
 compile_manpages() {
 	einfo "Making manpages ..."
-	env -u ARCH make mandocs
+	env -u ARCH -u KBUILD_OUTPUT make mandocs
 }
 
 # install functions
-- 
cgit v1.2.3-65-gdbad