diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-02-03 20:24:21 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-02-03 20:24:21 +0000 |
| commit | db9ba9ee1b648edeb7aedb4aad6a7ced326bd38b (patch) | |
| tree | 2872ab2c030ba4cab1c8de5486b9f115e47fad3e /Makefile.inc1 | |
| parent | 729ac0ee8cd058899e8a95278d494e05d42de601 (diff) | |
| download | src-db9ba9ee1b648edeb7aedb4aad6a7ced326bd38b.tar.gz src-db9ba9ee1b648edeb7aedb4aad6a7ced326bd38b.zip | |
Deduplicate distrib-dirs logic from r289086 in distribution.
This does it correctly this time, rather than the incorrect version in
r295167.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=295217
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 222d7ec2b74f..ccd25d001d60 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1083,16 +1083,14 @@ redistribute: .MAKE .PHONY DISTRIBUTION=lib32 .endif -distrib-dirs: .MAKE .PHONY - ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ - ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} - -distribution: .MAKE .PHONY +distrib-dirs distribution: .MAKE .PHONY ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} +.if make(distribution) ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ METALOG=${METALOG} installconfig +.endif # # buildkernel and installkernel |