diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-18 17:08:29 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-18 17:08:29 +0000 |
commit | 494f1b949530354cfb25ddf7e865b1444d4e221f (patch) | |
tree | eac77ccd64e5cbee60e0de4e114831a421ba707f /Makefile.inc1 | |
parent | cd3729c2d67419b22fcbfbc00088cad3fcfc0808 (diff) | |
download | FreeBSD-src-494f1b949530354cfb25ddf7e865b1444d4e221f.zip FreeBSD-src-494f1b949530354cfb25ddf7e865b1444d4e221f.tar.gz |
Combine restage/reinstall in a safe way.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 28650bc..ed68140 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -975,27 +975,19 @@ packageworld: .PHONY # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: .MAKE .PHONY +restage reinstall: .MAKE .PHONY @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy - @echo +.if make(restage) @echo "--------------------------------------------------------------" - @echo ">>> Installing everything" - @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if defined(LIBCOMPAT) - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat} -.endif - -restage: .MAKE .PHONY - @echo "--------------------------------------------------------------" - @echo ">>> Making hierarchy" + @echo ">>> Making distribution" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution + LOCAL_MTREE=${LOCAL_MTREE:Q} distribution +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" |