From 381fcf101dcedbe13df2d886d2532375245a59ce Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Tue, 10 May 2016 00:47:49 +0000 Subject: [PATCH] Combine the 'reinstall' and 'restage' targets, which appears to have been a mismerge. Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 465610661d3..d6b5f87c730 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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