svn commit: r276594 - stable/10

[Baptiste Daroussin]

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