From 3f2aa30a37a8e7baa733a9ae4b6ba7088185c296 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 11 Dec 1999 17:05:36 +0000
Subject: [PATCH] Don't add MACHINE_ARCH to MAKEOBJDIRPREFIX when not
 cross-building. This should fix make release.

Reported by: jhay, phk
---
 Makefile.inc1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 67bfcfe1ccdb..5b0b5b2e07e0 100644
--- 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}