Date: Mon, 5 May 2014 18:18:24 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265380 - projects/bmake/share/mk Message-ID: <201405051818.s45IIOO4027403@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Mon May 5 18:18:23 2014 New Revision: 265380 URL: http://svnweb.freebsd.org/changeset/base/265380 Log: Leverage bsd.opts.mk Modified: projects/bmake/share/mk/local.dirdeps.mk Modified: projects/bmake/share/mk/local.dirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.dirdeps.mk Mon May 5 18:17:26 2014 (r265379) +++ projects/bmake/share/mk/local.dirdeps.mk Mon May 5 18:18:23 2014 (r265380) @@ -1,6 +1,10 @@ .if !target(_DIRDEP_USE) # we are the 1st makefile +.if !defined(MK_CTF) +.include "${SRCTOP}/share/mk/bsd.opts.mk" +.endif + # DEP_MACHINE is set before we get here, this may not be. DEP_RELDIR ?= ${RELDIR} @@ -39,7 +43,7 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshar .endif # some optional things -.if !defined(WITHOUT_CTF) && ${DEP_RELDIR:U${RELDIR}:Mcddl/usr.bin/ctf*} == "" +.if ${MK_CTF} == "yes" && ${DEP_RELDIR:U${RELDIR}:Mcddl/usr.bin/ctf*} == "" DIRDEPS += \ cddl/usr.bin/ctfconvert.host \ cddl/usr.bin/ctfmerge.host
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405051818.s45IIOO4027403>