From 8ec855315e8a2fb8fd60c8052fc1f36ecdceacc9 Mon Sep 17 00:00:00 2001
From: sheldonh <sheldonh@FreeBSD.org>
Date: Thu, 17 Aug 2000 14:41:48 +0000
Subject: The previous delta was wrong; an empty MAKEOBJDIRPREFIX should cause
 the working directory to be used.  Make it so.

When we're more convinced that it'll work, we might try this
to avoid a shell invocation:

.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX) &&
    exists(${CANONICALOBJDIR}/)

Reported by:	bde
---
 share/mk/bsd.obj.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'share/mk')

diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 71f4660..4a68087 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -43,7 +43,7 @@
 #		create build directory.
 #
 
-.if defined(MAKEOBJDIRPREFIX) && !empty(MAKEOBJDIRPREFIX)
+.if defined(MAKEOBJDIRPREFIX)
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
@@ -97,7 +97,7 @@ whereobj:
 .endif
 
 cleanobj:
-	@if [ -d ${CANONICALOBJDIR}/ ]; then \
+	@if [ -n ${MAKEOBJDIRPREFIX} -a -d ${CANONICALOBJDIR}/ ]; then \
 		rm -rf ${CANONICALOBJDIR}; \
 	else \
 		cd ${.CURDIR} && ${MAKE} clean cleandepend; \
-- 
cgit v1.1