svn commit: r287636 - head/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Fri Sep 11 00:19:49 2015
New Revision: 287636
URL: https://svnweb.freebsd.org/changeset/base/287636

Log:
  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

Modified:
  head/share/mk/local.meta.sys.mk

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Thu Sep 10 22:47:26 2015	(r287635)
+++ head/share/mk/local.meta.sys.mk	Fri Sep 11 00:19:49 2015	(r287636)
@@ -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