From ac4ef3f9a930ff4df06970c60eda9f66f9963989 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 25 May 2017 16:31:53 +0000 Subject: [PATCH] Now that roff documentation has been disconnected from the build, it is no longer necessary to have groff(1) as a bootstrap tool --- Makefile.inc1 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 122dc7760147..5b518cc754b3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -505,11 +505,6 @@ CROSSENV+= MAKEOBJDIRPREFIX=${OBJTREE} \ # Don't rebuild build-tools targets during normal build. CROSSENV+= BUILD_TOOLS_META=.NOMETA .endif -.if ${MK_GROFF} != "no" -CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ - GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ - GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac -.endif .if defined(TARGET_CFLAGS) CROSSENV+= ${TARGET_CFLAGS} .endif @@ -718,10 +713,6 @@ _worldtmp: .PHONY .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${WORLDTMP}/legacy/usr >/dev/null -.if ${MK_GROFF} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \ - -p ${WORLDTMP}/legacy/usr >/dev/null -.endif mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/legacy/usr/include >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ @@ -1654,11 +1645,6 @@ _strfile= usr.bin/fortune/strfile _gperf= gnu/usr.bin/gperf .endif -.if ${MK_SHAREDOCS} != "no" && ${MK_GROFF} != "no" -_groff= gnu/usr.bin/groff \ - usr.bin/soelim -.endif - .if ${MK_VT} != "no" _vtfontcvt= usr.bin/vtfontcvt .endif @@ -1765,7 +1751,6 @@ bootstrap-tools: .PHONY ${_kerberos5_bootstrap_tools} \ ${_strfile} \ ${_gperf} \ - ${_groff} \ ${_dtc} \ ${_cat} \ ${_kbdcontrol} \