svn commit: r324848 - projects/runtime-coverage

[Ngie Cooper]

Author: ngie
Date: Sun Oct 22 07:16:35 2017
New Revision: 324848
URL: https://svnweb.freebsd.org/changeset/base/324848

Log:
  Tweaks to make libraries and make installworld
  
  - Optimize/fix _prereq_libs and _generic_libs by not installing the .gcno files
    with "make install". This cuts down on installing unnecessary files to
    WORLDTMP and fixes the build, since BSD.coverage.dist wasn't being splatted
    on WORLDTMP.
  - Splat BSD.coverage.dist on ${DESTDIR}/usr/lib in distributeworld/installworld
    so the files will be installed to the proper places.

Modified:
  projects/runtime-coverage/Makefile.inc1

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Sun Oct 22 07:12:55 2017	(r324847)
+++ projects/runtime-coverage/Makefile.inc1	Sun Oct 22 07:16:35 2017	(r324848)
@@ -1170,6 +1170,10 @@ distributeworld installworld stageworld: _installcheck
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
+.if ${MK_COVERAGE} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.cov.dist \
+	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
+.endif
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
@@ -2492,7 +2496,7 @@ ${_lib}__PL: .PHONY .MAKE
 		if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all; \
-		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
+		${MAKE} MK_COVERAGE=no MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
@@ -2504,7 +2508,7 @@ ${_lib}__L: .PHONY .MAKE
 		cd ${.CURDIR}/${_lib}; \
 		if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \
-		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
+		${MAKE} MK_COVERAGE=no MK_TESTS=no DIRPRFX=${_lib}/ install
 .endif
 .endfor