From ccb8bfa988f3ff3f2d6c55b5d2861e4d081e0234 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 17 Jan 1998 15:52:32 +0000
Subject: [PATCH] Don't install the tcl implementation headers.  The tcl
 distribution makefile doesn't install them, and they couldn't be used without
 lots of undocumented -I's in CFLAGS.  tcl.h is still installed in
 /usr/include/tcl/.  Note that rev.1.24 of tcl_bmake/mkMakefile.sh broke all
 the section 3 tcl man pages by putting it there instead of in /usr/include.

---
 etc/mtree/BSD.include.dist          |  6 +-----
 lib/libtcl/Makefile                 | 10 +---------
 tools/tools/tcl_bmake/mkMakefile.sh | 12 ++----------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index fd1f4d392dc1..bf7bc0983799 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.include.dist,v 1.13 1997/06/04 23:05:31 ache Exp $
+#	$Id: BSD.include.dist,v 1.14 1997/09/28 09:20:48 markm Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
@@ -48,10 +48,6 @@
     sys
     ..
     tcl
-        generic
-        ..
-        unix
-        ..
     ..
     ufs
         ffs
diff --git a/lib/libtcl/Makefile b/lib/libtcl/Makefile
index 0847bdf8db21..57be55d50f1b 100644
--- a/lib/libtcl/Makefile
+++ b/lib/libtcl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.25 1997/11/27 20:52:28 pst Exp $
+# $Id: Makefile,v 1.26 1998/01/17 15:49:55 bde Exp $
 #
 # This file is generated automatically, do not edit it here!
 #
@@ -42,9 +42,6 @@ SRCS=	panic.c regexp.c tclAsync.c tclBasic.c tclBinary.c tclCkalloc.c \
 	tclUnixFCmd.c tclUnixFile.c tclUnixPipe.c tclUnixSock.c \
 	tclUnixTime.c tclUnixInit.c tclUnixNotfy.c tclLoadDl.c
 
-HEADERS=generic/patchlevel.h generic/tclInt.h generic/tclPort.h \
-	generic/tclRegexp.h unix/tclUnixPort.h
-
 beforeinstall: installhdrs
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${TCLDIST}/library/tclIndex ${DESTDIR}${TCL_LIBRARY} 
@@ -61,11 +58,6 @@ beforeinstall: installhdrs
 installhdrs:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${TCLDIST}/generic/tcl.h ${DESTDIR}/usr/include/tcl
-.for m in ${HEADERS}
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${TCLDIST}/$m \
-		${DESTDIR}/usr/include/tcl/$m
-.endfor
-
 
 MANFILTER=sed "/\.so *man.macros/s;.*;.so /usr/share/tmac/tcl.macros;"
 
diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh
index 3e3feea898b8..10d3124cc93c 100644
--- a/tools/tools/tcl_bmake/mkMakefile.sh
+++ b/tools/tools/tcl_bmake/mkMakefile.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: mkMakefile.sh,v 1.26 1997/10/01 13:31:29 phk Exp $
+# $Id: mkMakefile.sh,v 1.27 1998/01/17 15:49:48 bde Exp $
 #
 # This script generates a bmake Makefile for src/lib/libtcl
 #
@@ -45,7 +45,7 @@ echo '#
 # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
 #
 # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# $Id: mkMakefile.sh,v 1.26 1997/10/01 13:31:29 phk Exp $
+# $Id: mkMakefile.sh,v 1.27 1998/01/17 15:49:48 bde Exp $
 #
 ' | tr -d '$' >> ${LIBTCL}Makefile
 
@@ -98,9 +98,6 @@ $s/ \\$//
 ' >> ${LIBTCL}Makefile
 
 echo '
-HEADERS=generic/patchlevel.h generic/tclInt.h generic/tclPort.h \
-	generic/tclRegexp.h unix/tclUnixPort.h
-
 beforeinstall: installhdrs
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${TCLDIST}/library/tclIndex ${DESTDIR}${TCL_LIBRARY} 
@@ -117,11 +114,6 @@ beforeinstall: installhdrs
 installhdrs:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${TCLDIST}/generic/tcl.h ${DESTDIR}/usr/include/tcl
-.for m in ${HEADERS}
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${TCLDIST}/$m \
-		${DESTDIR}/usr/include/tcl/$m
-.endfor
-
 
 MANFILTER=sed "/\.so *man.macros/s;.*;.so /usr/share/tmac/tcl.macros;"
 ' >> ${LIBTCL}Makefile