diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-13 17:44:20 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-13 17:44:20 +0000 |
| commit | ec7afdf6467b4a1b66ac449776a14b873ce99376 (patch) | |
| tree | db8d97d4c59a11a5875dbc51f50d599e2313667e /Makefile.inc1 | |
| parent | afc27481939cf4b83da45b2fdda712813da2ac19 (diff) | |
| download | FreeBSD-src-ec7afdf6467b4a1b66ac449776a14b873ce99376.zip FreeBSD-src-ec7afdf6467b4a1b66ac449776a14b873ce99376.tar.gz | |
Support libsoft for restage.
This is essentially fixing a merge conflict.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 4656106..3fa5537 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |
