Author: gjb
Date: Tue May 10 00:47:49 2016
New Revision: 299292
URL: https://svnweb.freebsd.org/changeset/base/299292
Log:
Combine the 'reinstall' and 'restage' targets, which appears to have
been a mismerge.
Sponsored by: The FreeBSD Foundation
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue May 10 00:38:14 2016 (r299291)
+++ head/Makefile.inc1 Tue May 10 00:47:49 2016 (r299292)
@@ -976,12 +976,12 @@ packageworld: .PHONY
# and do a 'make reinstall' on the *client* to install new binaries from the
# most recent server build.
#
-reinstall: .MAKE .PHONY
+reinstall restage: .MAKE .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
- LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
+ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution
@echo
@echo "--------------------------------------------------------------"
@echo ">>> Installing everything"
@@ -990,18 +990,6 @@ reinstall: .MAKE .PHONY
.if defined(LIBCOMPAT)
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
.endif
-
-restage: .MAKE .PHONY
- @echo "--------------------------------------------------------------"
- @echo ">>> Making hierarchy"
- @echo "--------------------------------------------------------------"
- ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
- LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution
- @echo
- @echo "--------------------------------------------------------------"
- @echo ">>> Installing everything"
- @echo "--------------------------------------------------------------"
- ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
