Date: Sat, 30 May 2015 17:27:52 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r283775 - projects/bmake/share/mk Message-ID: <201505301727.t4UHRqq5013804@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505301727.t4UHRqq5013804>