diff options
| author | uqs <uqs@FreeBSD.org> | 2011-02-22 08:13:49 +0000 |
|---|---|---|
| committer | uqs <uqs@FreeBSD.org> | 2011-02-22 08:13:49 +0000 |
| commit | 433f0177d0a0855e8bd7df40e3070caa53112863 (patch) | |
| tree | bc4366064e389b18b74f217f17bd3ee50484e806 /Makefile.inc1 | |
| parent | 39bd167d328aba193d4774d21ec95b107419b186 (diff) | |
| download | FreeBSD-src-433f0177d0a0855e8bd7df40e3070caa53112863.zip FreeBSD-src-433f0177d0a0855e8bd7df40e3070caa53112863.tar.gz | |
Flesh out WITHOUT_GROFF support to DTRT.
A full featured groff is required during buildworld, so build it always
and don't rely on it being present on the host system.
vgrind(1) is tightly coupled to a roff processor and will not be
built/installed when groff is disabled. Also much of the roff'ed
documentation under share/doc will not be built/installed when
WITHOUT_GROFF is defined.
Reviewed by: ru (partial)
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index de00716..102f418 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -213,13 +213,15 @@ BOOTSTRAPPING?= 0 CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ - CPUTYPE=${TARGET_CPUTYPE} \ - GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ - GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ - GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac + CPUTYPE=${TARGET_CPUTYPE} .if ${OSRELDATE} < 700044 CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib .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 # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -364,6 +366,10 @@ _worldtmp: .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.usr.dist \ -p ${WORLDTMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -937,11 +943,10 @@ _strfile= games/fortune/strfile .if ${MK_CXX} != "no" _gperf= gnu/usr.bin/gperf -.if ${BOOTSTRAPPING} < 700004 -_groff= gnu/usr.bin/groff -.else -_groff= gnu/usr.bin/groff/tmac .endif + +.if ${MK_GROFF} != "no" +_groff= gnu/usr.bin/groff .endif .if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 |
