From 9567ee23d9b3f232f961bf92dba4b8d2c222b2b2 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Fri, 11 Sep 2015 00:19:49 +0000
Subject: Handle default MAKEOBJDIR for META_MODE. If MAKEOBJDIRPREFIX is set,
 use it for default OBJROOT. If MAKEOBJDIR is empty or not a suitable value
 (no '/') set a default that works.

Reviewed by: bdrewery
---
 share/mk/local.meta.sys.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index f927b67..09805dd 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -13,11 +13,14 @@ MK_INSTALL_AS_USER= yes
 .warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR...
 # put things approximately where they want
 OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/
+MAKEOBJDIRPREFIX=
+.export MAKEOBJDIRPREFIX
+.endif
+.if empty(MAKEOBJDIR) || ${MAKEOBJDIR:M*/*} == ""
 # OBJTOP set below
 MAKEOBJDIR=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},}
-MAKEOBJDIRPREFIX=
 # export but do not track
-.export-env MAKEOBJDIRPREFIX MAKEOBJDIR
+.export-env MAKEOBJDIR
 # now for our own use
 MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},}
 .endif
-- 
cgit v1.1