Index: stable/10/share/mk/bsd.files.mk
===================================================================
--- stable/10/share/mk/bsd.files.mk	(revision 276421)
+++ stable/10/share/mk/bsd.files.mk	(revision 276422)
@@ -1,67 +1,70 @@
 # $FreeBSD$
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.files.mk cannot be included directly.
 .endif
 
+.if !target(__<bsd.files.mk>__)
+__<bsd.files.mk>__:
+
 FILESGROUPS?=	FILES
 
-.if !target(buildfiles)
 .for group in ${FILESGROUPS}
 buildfiles: ${${group}}
 .endfor
-.endif
 
 all: buildfiles
 
 .for group in ${FILESGROUPS}
 .if defined(${group}) && !empty(${group})
 installfiles: installfiles-${group}
 
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
 ${group}MODE?=	${SHAREMODE}
 ${group}DIR?=	${BINDIR}
 
 _${group}FILES=
 .for file in ${${group}}
 .if defined(${group}OWN_${file:T}) || defined(${group}GRP_${file:T}) || \
     defined(${group}MODE_${file:T}) || defined(${group}DIR_${file:T}) || \
     defined(${group}NAME_${file:T})
 ${group}OWN_${file:T}?=	${${group}OWN}
 ${group}GRP_${file:T}?=	${${group}GRP}
 ${group}MODE_${file:T}?=	${${group}MODE}
 ${group}DIR_${file:T}?=	${${group}DIR}
 .if defined(${group}NAME)
 ${group}NAME_${file:T}?=	${${group}NAME}
 .else
 ${group}NAME_${file:T}?=	${file:T}
 .endif
 installfiles-${group}: _${group}INS_${file:T}
 _${group}INS_${file:T}: ${file}
 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
 	    ${.ALLSRC} \
 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
 .else
 _${group}FILES+= ${file}
 .endif
 .endfor
 .if !empty(_${group}FILES)
 installfiles-${group}: _${group}INS
 _${group}INS: ${_${group}FILES}
 .if defined(${group}NAME)
 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
 	    -m ${${group}MODE} ${.ALLSRC} \
 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
 .else
 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
 .endif
 .endif
 
 .endif # defined(${group}) && !empty(${group})
 .endfor
 
 realinstall: installfiles
 .ORDER: beforeinstall installfiles
+
+.endif # !target(__<bsd.files.mk>__)
Index: stable/10/share/mk/bsd.test.mk
===================================================================
--- stable/10/share/mk/bsd.test.mk	(revision 276421)
+++ stable/10/share/mk/bsd.test.mk	(revision 276422)
@@ -1,101 +1,100 @@
 # $FreeBSD$
 #
 # Generic build infrastructure for test programs.
 #
 # This is the only public file that should be included by Makefiles when
 # tests are to be built.  All other *.test.mk files are internal and not
 # to be included directly.
 
 .include <bsd.init.mk>
 
 __<bsd.test.mk>__:
 
 # List of subdirectories containing tests into which to recurse.  This has the
 # same semantics as SUBDIR at build-time.  However, the directories listed here
 # get registered into the run-time test suite definitions so that the test
 # engines know to recurse into these directories.
 #
 # In other words: list here any directories that contain test programs but use
 # SUBDIR for directories that may contain helper binaries and/or data files.
 TESTS_SUBDIRS?=
 
 # If defined, indicates that the tests built by the Makefile are not part of
 # the FreeBSD Test Suite.  The implication of this is that the tests won't be
 # installed under /usr/tests/ and that Kyua won't be able to run them.
 #NOT_FOR_TEST_SUITE=
 
 # List of variables to pass to the tests at run-time via the environment.
 TESTS_ENV?=
 
 # Force all tests in a separate distribution file.
 #
 # We want this to be the case even when the distribution name is already
 # overriden.  For example: we want the tests for programs in the 'games'
 # distribution to end up in the 'tests' distribution; the test programs
 # themselves have all the necessary logic to detect that the games are not
 # installed and thus won't cause false negatives.
 DISTRIBUTION:=	tests
 
 # Ordered list of directories to construct the PATH for the tests.
 TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \
              ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
 TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/g}
 
 # Ordered list of directories to construct the LD_LIBRARY_PATH for the tests.
 TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib
 TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g}
 
 # List of all tests being built.  The various *.test.mk modules extend this
 # variable as needed.
 _TESTS=
 
 # Pull in the definitions of all supported test interfaces.
 .include <atf.test.mk>
 .include <plain.test.mk>
 .include <tap.test.mk>
 
 .for ts in ${TESTS_SUBDIRS}
 .if empty(SUBDIR:M${ts})
 SUBDIR+= ${ts}
 .endif
 .endfor
 
 # it is rare for test cases to have man pages
 .if !defined(MAN)
 WITHOUT_MAN=yes
 .export WITHOUT_MAN
 .endif
 
 # tell progs.mk we might want to install things
 PROG_VARS+= BINDIR
 PROGS_TARGETS+= install
 
 .if !defined(NOT_FOR_TEST_SUITE)
 .include <suite.test.mk>
 .endif
 
 .if !target(realtest)
 realtest: .PHONY
 	@echo "$@ not defined; skipping"
 .endif
 
 test: .PHONY
 .ORDER: beforetest realtest
 test: beforetest realtest
 
 .if target(aftertest)
 .ORDER: realtest aftertest
 test: aftertest
 .endif
 
 .if !empty(SUBDIR)
 .include <bsd.subdir.mk>
 .endif
 
 .if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS)
 .include <bsd.progs.mk>
-.elif !empty(FILES)
-.include <bsd.files.mk>
 .endif
+.include <bsd.files.mk>
 
 .include <bsd.obj.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 276421)
+++ stable/10	(revision 276422)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r267276