[Midnightbsd-cvs] src [10272] trunk/share/mk/bsd.obj.mk: fixup

[laffer1 at midnightbsd.org]

Revision: 10272
          http://svnweb.midnightbsd.org/src/?rev=10272
Author:   laffer1
Date:     2018-06-02 18:14:31 -0400 (Sat, 02 Jun 2018)
Log Message:
-----------
fixup

Modified Paths:
--------------
    trunk/share/mk/bsd.obj.mk

Modified: trunk/share/mk/bsd.obj.mk
===================================================================
--- trunk/share/mk/bsd.obj.mk	2018-06-02 22:13:31 UTC (rev 10271)
+++ trunk/share/mk/bsd.obj.mk	2018-06-02 22:14:31 UTC (rev 10272)
@@ -1,5 +1,5 @@
-# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.54 2005/04/11 07:13:29 harti Exp $
 # $MidnightBSD$
+# $FreeBSD: stable/10/share/mk/bsd.obj.mk 292240 2015-12-15 01:37:46Z bdrewery $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
@@ -45,12 +45,15 @@
 
 .if defined(MAKEOBJDIRPREFIX)
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
-.elif defined(MAKEOBJDIR) &&${MAKEOBJDIR:M/*} != ""
+.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
 CANONICALOBJDIR:=${MAKEOBJDIR}
+OBJTOP?= ${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
 
+OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
+
 #
 # Warn of unorthodox object directory.
 #
@@ -90,6 +93,16 @@
 		fi; \
 		${ECHO} "${CANONICALOBJDIR} created for ${.CURDIR}"; \
 	fi
+.for dir in ${SRCS:H:O:u}
+	@if ! test -d ${CANONICALOBJDIR}/${dir}/; then \
+		mkdir -p ${CANONICALOBJDIR}/${dir}; \
+		if ! test -d ${CANONICALOBJDIR}/${dir}/; then \
+			${ECHO} "Unable to create ${CANONICALOBJDIR}/${dir}."; \
+			exit 1; \
+		fi; \
+		${ECHO} "${CANONICALOBJDIR}/${dir} created for ${.CURDIR}"; \
+	fi
+.endfor
 .endif
 
 .if !target(objlink)