summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2011-01-31 10:58:14 +0000
committermatt <matt@NetBSD.org>2011-01-31 10:58:14 +0000
commitfdac06153b8b86df752708eb4c5f60058fc43aeb (patch)
tree262013a568899ad065cea7cbaacdcb7f24027c5d /compat
parentf82f1883574c6c0212c1214622a1a4e3e07af92b (diff)
if using MAKEOBJDIRPREFIX, make sure to unset it since it would override
the use of MAKEOBJDIR.
Diffstat (limited to 'compat')
-rw-r--r--compat/compatsubdir.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/compat/compatsubdir.mk b/compat/compatsubdir.mk
index a28489191c3..8ad5d6bb7f4 100644
--- a/compat/compatsubdir.mk
+++ b/compat/compatsubdir.mk
@@ -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}