3 files changed, 3 insertions, 31 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index f37435d..0a96be8 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.108 1998/08/30 02:48:12 jb Exp $
+#	$Id: Makefile,v 1.109 1998/08/30 20:28:50 gpalmer Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
@@ -221,9 +221,4 @@ SUBDIR+=doscmd
 .endif
 .endif
 
-.if !defined(NOTCL) && exists (${.CURDIR}/../contrib/tcl) && \
-	exists(${.CURDIR}/tclsh) && exists (${.CURDIR}/../lib/libtcl)
-SUBDIR+=tclsh
-.endif
-
 .include <bsd.subdir.mk>
diff --git a/usr.bin/tclsh/Makefile b/usr.bin/tclsh/Makefile
deleted file mode 100644
index c847be75..0000000
--- a/usr.bin/tclsh/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: Makefile,v 1.5 1997/08/18 11:39:19 peter Exp $
-
-PROG=   tclsh
-SRCS=   tclAppInit.c
-
-BINDIR= /usr/bin
-
-.PATH: ${DESTDIR}/usr/libdata/tcl
-
-MAN1=   tclsh.1
-
-CLEANFILES=     ${MAN1}
-
-tclsh.1:        ${.CURDIR}/../../contrib/tcl/doc/tclsh.1
-	sed '/\.so *man.macros/s;.*;.so /usr/share/tmac/tcl.macros;' < ${.ALLSRC} > ${.TARGET}
-
-CFLAGS+= -I${DESTDIR}/usr/include/tcl
-LDADD+= -ltcl -lm
-DPADD+= ${LIBTCL} ${LIBM}
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index f40fb04..13cbb22 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.21 1997/09/22 23:14:37 wosch Exp $
+# $Id: Makefile,v 1.22 1998/06/09 04:07:20 imp Exp $
 #
 # This has most of the glue needed to compile tknvi and the perl hooks,
 # but not all.
@@ -14,9 +14,7 @@ APISTUFF=	ex_notcl.c ex_noperl.c
 
 .else
 
-.if !defined(NOTCL)
-#TCLINTERP=	yes	#we have it in the base tree, little cost to vi
-.endif
+#TCLINTERP=	yes	#we don't have it in the base tree
 #TKNVI=		yes	#not ready, needs X11, tk, doesn't quite work yet
 #PERLINTERP=	yes	#needs the perl5 v5.003 port