svn commit: r322701 - projects/runtime-coverage/share/mk
Ngie Cooper
ngie at FreeBSD.org
Sat Aug 19 18:52:45 UTC 2017
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}/
More information about the svn-src-projects
mailing list