svn commit: r317106 - head/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Tue Apr 18 23:59:15 2017
New Revision: 317106
URL: https://svnweb.freebsd.org/changeset/base/317106

Log:
  If MAKEOBJDIRPREFIX is a prefix match for .CURDIR, then __objdir is .CURDIR
  
  Reviewed by:	bdrewery

Modified:
  head/share/mk/auto.obj.mk

Modified: head/share/mk/auto.obj.mk
==============================================================================
--- head/share/mk/auto.obj.mk	Tue Apr 18 21:21:31 2017	(r317105)
+++ head/share/mk/auto.obj.mk	Tue Apr 18 23:59:15 2017	(r317106)
@@ -42,6 +42,10 @@ MKOBJDIRS= auto
 # Use __objdir here so it is easier to tweak without impacting
 # the logic.
 .if !empty(MAKEOBJDIRPREFIX)
+.if ${.CURDIR:M${MAKEOBJDIRPREFIX}/*} != ""
+# we are already in obj tree!
+__objdir?= ${.CURDIR}
+.endif
 __objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR}
 .endif
 __objdir?= ${MAKEOBJDIR:Uobj}