svn commit: r283775 - projects/bmake/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Sat May 30 17:27:52 2015
New Revision: 283775
URL: https://svnweb.freebsd.org/changeset/base/283775

Log:
  Test that .CURDIR is component of (or matches) .OBJDIR

Modified:
  projects/bmake/share/mk/src.libnames.mk

Modified: projects/bmake/share/mk/src.libnames.mk
==============================================================================
--- projects/bmake/share/mk/src.libnames.mk	Sat May 30 17:24:41 2015	(r283774)
+++ projects/bmake/share/mk/src.libnames.mk	Sat May 30 17:27:52 2015	(r283775)
@@ -9,8 +9,8 @@
 
 .include <src.opts.mk>
 
-.if defined(MAKEOBJDIRPREFIX) && ${.OBJDIR:M${MAKEOBJDIRPREFIX}/*} != ""
-ROOTOBJDIR=	${.OBJDIR:S/${.CURDIR}//}${SRCTOP}
+.if ${.OBJDIR:S,${.CURDIR},,} != ${.OBJDIR}
+ROOTOBJDIR=	${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
 .elif defined(OBJTOP) && ${.OBJDIR:M${OBJTOP}*} != ""
 ROOTOBJDIR=	${OBJTOP}
 .endif