Don't put "install-info" to the list of install-tools if we're

installing with -DWITHOUT_INFO, otherwise one can experience a
failure trying to installworld on a system that is built with
-DWITHOUT_INFO (i.e., without /usr/bin/install-info).

Reported by:	bland
MFC after:	3 days
This commit is contained in:
Ruslan Ermilov 2009-03-13 10:09:08 +00:00
parent e81879a123
commit 555aaddf22

View File

@ -612,8 +612,12 @@ installcheck_UGID:
# #
# Required install tools to be saved in a scratch dir for safety. # Required install tools to be saved in a scratch dir for safety.
# #
.if ${MK_INFO} != "no"
_install-info= install-info
.endif
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep install-info \ date echo egrep find grep ${_install-info} \
ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
test true uname wc zic test true uname wc zic