Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/compat/compatsubdir.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/compat/compatsubdir.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- src/compat/compatsubdir.mk	2011/01/20 18:43:52	1.6
+++ src/compat/compatsubdir.mk	2011/01/31 10:58:14	1.7
@@ -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}