Thu Jan 20 18:43:53 2011 UTC ()
Change to use MAKEOBJDIR instead of MAKEOBJDIRPREFIX


(matt)
diff -r1.5 -r1.6 src/compat/compatsubdir.mk
cvs diff -r1.5 -r1.6 src/compat/compatsubdir.mk (expand / switch to unified diff)

--- src/compat/compatsubdir.mk 2010/12/03 21:38:48 1.5
+++ src/compat/compatsubdir.mk 2011/01/20 18:43:52 1.6
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1# $NetBSD: compatsubdir.mk,v 1.5 2010/12/03 21:38:48 plunky Exp $ 1# $NetBSD: compatsubdir.mk,v 1.6 2011/01/20 18:43:52 matt Exp $
2 2
3# Build netbsd libraries. 3# Build netbsd libraries.
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7.if ${MKCOMPAT} != "no" 7.if ${MKCOMPAT} != "no"
8.if !make(includes) 8.if !make(includes)
9 9
10# make sure we get an objdir built early enough 10# make sure we get an objdir built early enough
11.include <bsd.prog.mk> 11.include <bsd.prog.mk>
12 12
13# XXX make this use MAKEOBJDIR 13MAKEDIRTARGETENV= MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}' MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
14MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} 
15 14
16.if defined(BOOTSTRAP_SUBDIRS) 15.if defined(BOOTSTRAP_SUBDIRS)
17SUBDIR= ${BOOTSTRAP_SUBDIRS} 16SUBDIR= ${BOOTSTRAP_SUBDIRS}
18.else 17.else
19SUBDIR= ../../../lib .WAIT \ 18SUBDIR= ../../../lib .WAIT \
20 ../../../libexec/ld.elf_so 19 ../../../libexec/ld.elf_so
21.endif 20.endif
22 21
23.include <bsd.subdir.mk> 22.include <bsd.subdir.mk>
24 23
25.endif 24.endif
26.endif 25.endif