svn commit: r299686 - head

[Bryan Drewery]

Author: bdrewery
Date: Fri May 13 17:44:20 2016
New Revision: 299686
URL: https://svnweb.freebsd.org/changeset/base/299686

Log:
  Support libsoft for restage.
  
  This is essentially fixing a merge conflict.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri May 13 17:38:59 2016	(r299685)
+++ head/Makefile.inc1	Fri May 13 17:44:20 2016	(r299686)
@@ -1002,8 +1002,8 @@ restage: .MAKE .PHONY
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if defined(LIB32TMP) && ${MK_LIB32} != "no"
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
+.if defined(LIBCOMPAT)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
 .endif
 
 redistribute: .MAKE .PHONY