From owner-svn-src-projects@freebsd.org Sat Aug 19 18:52:44 2017 Return-Path: Delivered-To: svn-src-projects@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 E9223DDC946 for ; Sat, 19 Aug 2017 18:52:44 +0000 (UTC) (envelope-from ngie@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 B73B0F5F; Sat, 19 Aug 2017 18:52:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7JIqhth071539; Sat, 19 Aug 2017 18:52:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7JIqhYM071538; Sat, 19 Aug 2017 18:52:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201708191852.v7JIqhYM071538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 19 Aug 2017 18:52:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322701 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 322701 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2017 18:52:45 -0000 Author: ngie Date: Sat Aug 19 18:52:43 2017 New Revision: 322701 URL: https://svnweb.freebsd.org/changeset/base/322701 Log: Don't override COVERAGEDIR in bsd.own.mk Modified: projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sat Aug 19 18:52:13 2017 (r322700) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sat Aug 19 18:52:43 2017 (r322701) @@ -83,8 +83,8 @@ DEBUGFILEDIR= ${DEBUGDIR}${BINDIR} DEBUGFILEDIR?= ${BINDIR}/.debug .endif .if ${MK_COVERAGE} != "no" -COVERAGEDIR= ${COVDIR}${BINDIR} -.if !exists(${DESTDIR}${COVERAGEDIR}) +_COVERAGEDIR= ${COVERAGEDIR}${BINDIR} +.if !exists(${DESTDIR}${_COVERAGEDIR}) COVERAGEMKDIR= .endif .endif @@ -250,10 +250,10 @@ _proginstall: .if ${MK_DEBUG_FILES} != "no" .if ${MK_COVERAGE} != "no" .if defined(COVERAGEMKDIR) - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${DESTDIR}${COVERAGEDIR}/ + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${DESTDIR}${_COVERAGEDIR}/ .endif ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \ - ${PROG_FULL} ${DESTDIR}${COVERAGEDIR}/${PROGNAME} + ${PROG_FULL} ${DESTDIR}${_COVERAGEDIR}/${PROGNAME} .endif .if defined(DEBUGMKDIR) ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -d ${DESTDIR}${DEBUGFILEDIR}/