From owner-svn-src-head@freebsd.org Tue Oct 31 00:07:43 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B34D9E3A005; Tue, 31 Oct 2017 00:07:43 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3675A7CBAB; Tue, 31 Oct 2017 00:07:42 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9V07f6K047573; Tue, 31 Oct 2017 00:07:41 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V07fol047572; Tue, 31 Oct 2017 00:07:41 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310007.v9V07fol047572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:07:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325190 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325190 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Oct 2017 00:07:44 -0000 Author: bdrewery Date: Tue Oct 31 00:07:41 2017 New Revision: 325190 URL: https://svnweb.freebsd.org/changeset/base/325190 Log: Add RELOBJTOP and RELSRCTOP for relative paths. RELSRCTOP is likely not as useful since make will always be running from inside of .OBJDIR and using something like ${.CURDIR}/${RELSRCTOP} is not redundant for ${SRCTOP}. Sponsored by: Dell EMC Isilon Modified: head/share/mk/src.sys.env.mk Modified: head/share/mk/src.sys.env.mk ============================================================================== --- head/share/mk/src.sys.env.mk Tue Oct 31 00:07:37 2017 (r325189) +++ head/share/mk/src.sys.env.mk Tue Oct 31 00:07:41 2017 (r325190) @@ -6,10 +6,14 @@ SRCTOP:= ${.PARSEDIR:tA:H:H} .if ${.CURDIR} == ${SRCTOP} -RELDIR = . +RELDIR= . +RELTOP= . .elif ${.CURDIR:M${SRCTOP}/*} -RELDIR := ${.CURDIR:S,${SRCTOP}/,,} +RELDIR:= ${.CURDIR:S,${SRCTOP}/,,} .endif +RELTOP?= ${RELDIR:C,[^/]+,..,g} +RELOBJTOP?= ${RELTOP} +RELSRCTOP?= ${RELTOP} # site customizations that do not depend on anything! SRC_ENV_CONF?= /etc/src-env.conf