From 555aaddf22dfd40ebafffe314fecaeae0415a036 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 13 Mar 2009 10:09:08 +0000 Subject: [PATCH] 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 --- Makefile.inc1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 53471d0f40c9..a74db4b5e02b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -612,8 +612,12 @@ installcheck_UGID: # # 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 \ - 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 \ test true uname wc zic