diff options
| author | ian <ian@FreeBSD.org> | 2014-08-19 23:33:51 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-08-19 23:33:51 +0000 |
| commit | c4195049f50843730d019b09549639061baee9f3 (patch) | |
| tree | 375a82f239f7aa39dc334cde99023f70cfa8558a /etc/Makefile | |
| parent | 6dd00f0d038b910cb8c3db81357a3fc44742e55e (diff) | |
| download | FreeBSD-src-c4195049f50843730d019b09549639061baee9f3.zip FreeBSD-src-c4195049f50843730d019b09549639061baee9f3.tar.gz | |
MFC r266473,267331,267511:
Use an intermediate target to associate with _SUBDIR which is marked .MAKE
this allows make -n to do tree walks as expected without
doing anything else (as intended).
Use prefix _sub. to help avoid conflict with any real target.
Put the test suite in its own tests.txz distribution file.
Force all the contents of /usr/tests to go into a separate distribution
file so that users of binary releases can easily choose to not install
Create a mechanism for providing fine-grained build order dependencies
during SUBDIR_PARALLEL builds. This augments the coarse .WAIT mechanism,
which is still useful if you've got a situation such as "almost everything
depends on A and B".
Diffstat (limited to 'etc/Makefile')
| -rw-r--r-- | etc/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/Makefile b/etc/Makefile index 302523c..e16b52d 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -174,7 +174,10 @@ afterinstall: .endif distribute: - ${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} + # Avoid installing tests here; "make distribution" will do this and + # correctly place them in the right location. + ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \ + DESTDIR=${DISTDIR}/${DISTRIBUTION} ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include <bsd.endian.mk> |
