svn commit: r189764 - head

[Ruslan Ermilov]

Author: ru
Date: Fri Mar 13 10:09:08 2009
New Revision: 189764
URL: http://svn.freebsd.org/changeset/base/189764

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Mar 13 08:48:33 2009	(r189763)
+++ head/Makefile.inc1	Fri Mar 13 10:09:08 2009	(r189764)
@@ -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