Don't add MACHINE_ARCH to MAKEOBJDIRPREFIX when not cross-building.

This should fix make release. Reported by: jhay, phk
1999-12-11 17:05:36 +00:00 · 1999-12-11 17:05:36 +00:00 · 42703df3e0
commit 42703df3e0
parent b0481fa219
1 changed files with 4 additions and 0 deletions
--- a/Makefile.inc1
+++ b/Makefile.inc1
@ -107,7 +107,11 @@ SUPFLAGS?=	-g -L 2 -P -

 MAKEOBJDIRPREFIX?=	/usr/obj
 BUILD_ARCH!=	sysctl -n hw.machine_arch
+.if ${BUILD_ARCH} == ${MACHINE_ARCH}
+OBJTREE=	${MAKEOBJDIRPREFIX}
+.else
 OBJTREE=	${MAKEOBJDIRPREFIX}/${MACHINE_ARCH}
+.endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/${BUILD_ARCH}
 STRICTTMPPATH=	${WORLDTMP}/bin:${WORLDTMP}/usr/bin
 TMPPATH=	${STRICTTMPPATH}:${PATH}