From owner-svn-src-all@FreeBSD.ORG  Fri Jan  2 23:13:05 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4D75BE99;
 Fri,  2 Jan 2015 23:13:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 38BB71A50;
 Fri,  2 Jan 2015 23:13:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t02ND5IT017011;
 Fri, 2 Jan 2015 23:13:05 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t02ND5Yf017010;
 Fri, 2 Jan 2015 23:13:05 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201501022313.t02ND5Yf017010@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 2 Jan 2015 23:13:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r276594 - stable/10
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2015 23:13:05 -0000

Author: bapt
Date: Fri Jan  2 23:13:04 2015
New Revision: 276594
URL: https://svnweb.freebsd.org/changeset/base/276594

Log:
  install-info is also needed for installworld so add it to the bootstrap tools
  
  Add BPATH to the installworld path to ensure using installworld works if
  install-info is not in base

Modified:
  stable/10/Makefile.inc1

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Fri Jan  2 23:10:28 2015	(r276593)
+++ stable/10/Makefile.inc1	Fri Jan  2 23:13:04 2015	(r276594)
@@ -815,6 +815,7 @@ MTREE_MAGIC?=	mtree 2.0
 
 distributeworld installworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
+	export PATH=${BPATH}:${PATH} ; \
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
 			echo $$progpath; \
@@ -1313,7 +1314,8 @@ _kerberos5_bootstrap_tools= \
 
 .if ${_BOOTSTRAP_MAKEINFO} != "no"
 _texinfo=	gnu/usr.bin/texinfo/libtxi \
-		gnu/usr.bin/texinfo/makeinfo
+		gnu/usr.bin/texinfo/makeinfo \
+		gnu/usr.bin/texinfo/install-info
 .endif
 #	Please document (add comment) why something is in 'bootstrap-tools'.
 #	Try to bound the building of the bootstrap-tool to just the