svn commit: r276549 - stable/9

[Baptiste Daroussin]

Author: bapt
Date: Fri Jan  2 18:32:53 2015
New Revision: 276549
URL: https://svnweb.freebsd.org/changeset/base/276549

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

Modified:
  stable/9/Makefile.inc1   (contents, props changed)
Directory Properties:
  stable/9/   (props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Fri Jan  2 18:31:12 2015	(r276548)
+++ stable/9/Makefile.inc1	Fri Jan  2 18:32:53 2015	(r276549)
@@ -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