From d00721de07057f902d42620c3848c61b00745389 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 20 Nov 2001 17:12:22 +0000 Subject: [PATCH] :U can't be used to test for existence, as the variable may contain an arbitrary value; change back to .if !defined(). Problem noted by bernd@arresum.inka.de in PR toolchain/14629. --- share/mk/bsd.obj.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 3ee6798c6fdf..38ecebb852c3 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.obj.mk,v 1.35 2001/11/14 22:29:23 tv Exp $ +# $NetBSD: bsd.obj.mk,v 1.36 2001/11/20 17:12:22 tv Exp $ .if !target(__initialized_obj__) __initialized_obj__: @@ -33,7 +33,10 @@ PAWD?= /bin/pwd __objdir= obj${OBJMACHINE:D.${MACHINE}} __usrobjdir= ${BSDOBJDIR}${USR_OBJMACHINE:D.${MACHINE}} -__usrobjdirpf= ${USR_OBJMACHINE:U${OBJMACHINE:D.${MACHINE}}} +__usrobjdirpf= +.if !defined(USR_OBJMACHINE) +__usrobjdirpf= ${OBJMACHINE:D.${MACHINE}} +.endif .if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ:Uno} != "no") # In case .CURDIR has been twiddled by a .mk file and is now relative,