[src/trunk]: src/compat if using MAKEOBJDIRPREFIX, make sure to unset it sinc...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7eaa8e769af8
branches:  trunk
changeset: 761533:7eaa8e769af8
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jan 31 10:58:14 2011 +0000

description:
if using MAKEOBJDIRPREFIX, make sure to unset it since it would override
the use of MAKEOBJDIR.

diffstat:

 compat/compatsubdir.mk |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 1c9a68f2f235 -r 7eaa8e769af8 compat/compatsubdir.mk
--- a/compat/compatsubdir.mk    Mon Jan 31 10:01:26 2011 +0000
+++ b/compat/compatsubdir.mk    Mon Jan 31 10:58:14 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: compatsubdir.mk,v 1.6 2011/01/20 18:43:52 matt Exp $
+#      $NetBSD: compatsubdir.mk,v 1.7 2011/01/31 10:58:14 matt Exp $
 
 # Build netbsd libraries.
 
@@ -10,7 +10,13 @@
 # make sure we get an objdir built early enough
 .include <bsd.prog.mk>
 
-MAKEDIRTARGETENV=      MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
+MAKEDIRTARGETENV=
+.if defined(MAKEOBJDIRPREFIX)
+MAKEDIRTARGETENV+=     unset MAKEOBJDIRPREFIX &&
+.endif
+MAKEDIRTARGETENV+=     MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}'
+MAKEDIRTARGETENV+=     MKOBJDIRS=yes MKSHARE=no
+MAKEDIRTARGETENV+=     BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
 
 .if defined(BOOTSTRAP_SUBDIRS)
 SUBDIR=        ${BOOTSTRAP_SUBDIRS}