diff options
author | bapt <bapt@FreeBSD.org> | 2015-01-02 18:27:32 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-01-02 18:27:32 +0000 |
commit | 54309b420b40263e94a001e302d6a2d1269d391d (patch) | |
tree | 55b8dd29f0780925f21116d1145eeba91ab50a1a | |
parent | d5a13901bff0d31efdcb363925086b0e00bea32b (diff) | |
download | FreeBSD-src-54309b420b40263e94a001e302d6a2d1269d391d.zip FreeBSD-src-54309b420b40263e94a001e302d6a2d1269d391d.tar.gz |
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
-rw-r--r-- | Makefile.inc1 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ddffb85..8d06367 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1358,6 +1358,11 @@ _share= share/syscons/scrnmaps _gcc_tools= gnu/usr.bin/cc/cc_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 @@ -1389,6 +1394,16 @@ build-tools: .MAKE ${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 + # # kernel-tools: Build kernel-building tools |