From 51e16fc1081d1973c7440dc0ce758f4e66f6e01f Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 12 Apr 1997 07:09:18 +0000 Subject: [PATCH] Make tclsh conditional on the src/contrib/tcl directory existing, and allow it to be disabled via NOTCL in /etc/make.conf (similar to other stuff in src/Makefile, eg: NOGAMES) --- usr.bin/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 40cfc0166a97..c2f44666db91 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $Id: Makefile,v 1.80 1997/02/22 19:53:59 peter Exp $ +# $Id: Makefile,v 1.81 1997/03/23 18:59:47 joerg Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct units xsend @@ -20,13 +20,18 @@ SUBDIR= apply ar at banner basename biff brandelf cal calendar \ printf quota ranlib rdist renice rev rlogin rpcgen \ rpcinfo rs rsh rup ruptime rusers rwall \ rwho script sed sgmlfmt sgmls shar showmount size soelim split \ - strings strip su symorder talk tclsh tconv tcopy tee tftp time \ + strings strip su symorder talk tconv tcopy tee tftp time \ tip tn3270 top touch tput tr true tset tsort tty ul uname \ unexpand unifdef uniq units unvis users uudecode uuencode vacation \ vgrind vi vis w wall wc what whereis which who whois window \ write xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich SUBDIR+=gprof4 +.if !defined(NOTCL) && exists (${.CURDIR}/../contrib/tcl) && \ + exists(${.CURDIR}/tclsh) && exists (${.CURDIR}/../lib/libtcl) +SUBDIR+=tclsh +.endif + .if !exists(../eBones) || defined(NOSECURE) || !defined(MAKE_EBONES) SUBDIR+=telnet .else