Date: Sat, 19 Aug 2017 18:52:43 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322701 - projects/runtime-coverage/share/mk Message-ID: <201708191852.v7JIqhYM071538@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708191852.v7JIqhYM071538>