From 4e1acfb4830fedd5b3255900b5c3300119941e5b Mon Sep 17 00:00:00 2001
From: cegger <cegger@NetBSD.org>
Date: Tue, 30 Mar 2010 13:17:47 +0000
Subject: [PATCH] move change from rev 1.232 to the initialization part. This
 fixes the problem 'nbconfig: cannot create /GENERIC' when KERNOBJDIR has a
 relative path and is defined as env variable. Problem reported and fix
 proposed on tech-toolchain@.

'commit it then' christos@
---
 build.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index b850f3f00379..e7065767bc3b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.232 2010/03/26 18:02:14 christos Exp $
+#	$NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $
 #
 # Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -259,6 +259,15 @@ initdefaults()
 	#
 	setmakeenv NETBSDSRCDIR "${TOP}"
 
+	# Make sure KERNOBJDIR is an absolute path if defined
+	#
+	case "${KERNOBJDIR}" in
+	''|/*)	;;
+	*)	KERNOBJDIR="${TOP}/${KERNOBJDIR}"
+		setmakeenv KERNOBJDIR "${KERNOBJDIR}"
+		;;
+	esac
+
 	# Find the version of NetBSD
 	#
 	DISTRIBVER="$(${HOST_SH} ${TOP}/sys/conf/osrelease.sh)"
@@ -1352,7 +1361,7 @@ createmakewrapper()
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.232 2010/03/26 18:02:14 christos Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.233 2010/03/30 13:17:47 cegger Exp $
 # with these arguments: ${_args}
 #
 
@@ -1421,13 +1430,6 @@ getkernelconf()
 	fi
 	KERNCONFDIR="$(getmakevar KERNCONFDIR)"
 	KERNOBJDIR="$(getmakevar KERNOBJDIR)"
-	case "${KERNOBJDIR}" in
-	''|/*)	;;
-	*)	KERNOBJDIR="${TOP}/${KERNOBJDIR}"
-		setmakeenv KERNOBJDIR "${KERNOBJDIR}"
-		;;
-	esac
-
 	case "${kernelconf}" in
 	*/*)
 		kernelconfpath="${kernelconf}"