From 2e7281ba86c2e2594e3465da18650c1478f632be Mon Sep 17 00:00:00 2001
From: marcel <marcel@FreeBSD.org>
Date: Sat, 11 Dec 1999 17:05:36 +0000
Subject: 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(+)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 67bfcfe..5b0b5b2 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}
-- 
cgit v1.1