diff options
| -rw-r--r-- | Makefile.inc1 | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index da5b508..e36c0eb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -580,12 +580,15 @@ installmost: .if exists(${.CURDIR}/games) && !defined(NOGAMES) _strfile= games/fortune/strfile .endif +.if ${CXX} != "c++" +_cxx_consumers= gnu/usr.bin/gperf gnu/usr.bin/groff +.endif bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ usr.bin/rpcgen usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ - gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo + ${_cxx_consumers} gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ @@ -660,6 +663,9 @@ cross-tools: hierarchy: cd ${.CURDIR}/etc; ${MAKE} distrib-dirs +.if ${CXX} == "c++" +NO_CXX= yes +.endif # # includes - possibly generate and install the include files. # diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index d1795b0..1aad223 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,7 +1,11 @@ # $FreeBSD$ -SUBDIR= awk bc binutils cpio dc dialog diff diff3 gperf \ - grep groff gzip man patch ptx rcs sdiff send-pr sort tar texinfo +SUBDIR= awk bc binutils cpio dc dialog diff diff3 \ + grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo + +.if ${CXX:T} != "c++" +SUBDIR+=gperf groff +.endif .if !defined(NO_CVS) SUBDIR+=cvs |
