Combine the 'reinstall' and 'restage' targets, which appears to have
been a mismerge. Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
de48750cce
commit
381fcf101d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=299292
@ -976,22 +976,7 @@ packageworld: .PHONY
|
||||
# and do a 'make reinstall' on the *client* to install new binaries from the
|
||||
# most recent server build.
|
||||
#
|
||||
reinstall: .MAKE .PHONY
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo ">>> Making hierarchy"
|
||||
@echo "--------------------------------------------------------------"
|
||||
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
|
||||
LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
|
||||
@echo
|
||||
@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
|
||||
reinstall restage: .MAKE .PHONY
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo ">>> Making hierarchy"
|
||||
@echo "--------------------------------------------------------------"
|
||||
@ -1002,6 +987,9 @@ restage: .MAKE .PHONY
|
||||
@echo ">>> Installing everything"
|
||||
@echo "--------------------------------------------------------------"
|
||||
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
|
||||
.if defined(LIBCOMPAT)
|
||||
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
|
||||
.endif
|
||||
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
|
||||
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user