From 5f20b5ced0b3dfe00a58a6eb235133e96f14cc35 Mon Sep 17 00:00:00 2001
From: bapt <bapt@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 2 Jan 2015 18:32:53 +0000
Subject: [PATCH] MFC: r276052,r276053

Build selective portions of gnu/usr.bin/texinfo as part of build-tools to
ensure that building on a host without makeinfo (i.e. a host where
make delete-old -DWITHOUT_INFO was run), then building with MK_INFO == yes
doesn't manifest in build errors when building info pages

This manifested itself like the following when I was build testing an MFC
change on stable/10:

  makeinfo --no-split -I /usr/src/gnu/lib/libregex/doc -I /usr/src/gnu/lib/libregex/doc regex.texi  -o regex.info
  makeinfo: not found
  *** [regex.info] Error code 127

make[6]: stopped in /usr/src/gnu/lib/libregex/doc
1 error


git-svn-id: svn://svn.freebsd.org/base/stable/9@276549 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 Makefile.inc1 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 25f73f5f1..23e354d31 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1221,6 +1221,11 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools
 _kerberos5_tools= kerberos5/tools
 .endif
 
+.if ${MK_INFO} != "no"
+_texinfo=	gnu/usr.bin/texinfo/libtxi \
+		gnu/usr.bin/texinfo/makeinfo
+.endif
+
 .if ${MK_RESCUE} != "no"
 _rescue= rescue/rescue
 .endif
@@ -1253,6 +1258,16 @@ build-tools:
 		${MAKE} DIRPRFX=${_tool}/ depend; \
 		${MAKE} DIRPRFX=${_tool}/ all
 .endfor
+.for _tool in \
+    ${_texinfo}
+	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
+		${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
+.endfor
+
 
 #
 # cross-tools: Build cross-building tools
-- 
2.45.0