@@ -1,4 +1,4 @@
-#	$NetBSD: compatsubdir.mk,v 1.5 2010/12/03 21:38:48 plunky Exp $
+#	$NetBSD: compatsubdir.mk,v 1.6 2011/01/20 18:43:52 matt Exp $
 
 # Build netbsd libraries.
 
@@ -10,8 +10,7 @@
 # make sure we get an objdir built early enough
 .include <bsd.prog.mk>
 
-# XXX make this use MAKEOBJDIR
-MAKEDIRTARGETENV=	MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
+MAKEDIRTARGETENV=	MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
 
 .if defined(BOOTSTRAP_SUBDIRS)
 SUBDIR=	${BOOTSTRAP_SUBDIRS}