From ff2edf0cf82cd183a136f12866170fc3affd891f Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 12 Apr 1997 07:06:08 +0000 Subject: [PATCH] Put on my flame proof suit and make libtcl build conditional on the src/contrib/tcl directory existing, and also have an /etc/make.conf override (NOTCL) to stop building libtcl. This is in similar other things from src/Makefile, eg: NOGAMES, NOLKM, etc. This is so that people can put in a refuse entry in their cvsup files and not fetch the tcl code, and have it not built automatically. I'll do something similar for perl. --- lib/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 476679843e9..8fae45709fc 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,6 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 - .if ${MACHINE} == "tahoe" SUBDIR=csu/tahoe.pcc .elif ${MACHINE} == "vax" @@ -13,13 +12,17 @@ SUBDIR=csu/${MACHINE} SUBDIR+=libc libcompat libcom_err libcurses libdisk libedit \ libf2c libftpio libgnumalloc libipx libkvm libmd libmytinfo \ libncurses libopie libpcap libresolv librpcsvc \ - libscsi libskey libss libtcl libtermcap libutil libxpg4 liby libz + libscsi libskey libss libtermcap libutil libxpg4 liby libz - .if defined(WANT_LIBC_R) SUBDIR+= libc_r .endif +.if !defined(NOTCL) && exists (${.CURDIR}/../contrib/tcl) && \ + exists(${.CURDIR}/../usr.bin/tclsh) && exists (${.CURDIR}/libtcl) +SUBDIR+=libtcl +.endif + .if !exists(${.CURDIR}/../secure) || defined(NOSECURE) || defined(NOCRYPT) SUBDIR+= libcrypt .else