This commit was generated by cvs2svn to compensate for changes in r18351,

which included commits to RCS files with non-trunk default branches.

10 files changed, 871 insertions, 601 deletions

diff --git a/contrib/tcl/unix/Makefile.in b/contrib/tcl/unix/Makefile.in
index b89bb43..79f4359 100644
--- a/contrib/tcl/unix/Makefile.in
+++ b/contrib/tcl/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# SCCS: @(#) Makefile.in 1.130 96/04/18 16:55:37
+# SCCS: @(#) Makefile.in 1.140 96/08/01 20:06:06
 
 # Current Tcl version;  used in various names.
 
@@ -45,6 +45,9 @@ SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(TCL_LIBRARY)
 # Directory in which to install libtcl.so or libtcl.a:
 LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
 
+# Path to use at runtime to refer to LIB_INSTALL_DIR:
+LIB_RUNTIME_DIR =	$(exec_prefix)/lib
+
 # Directory in which to install the program tclsh:
 BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
 
@@ -348,6 +351,10 @@ dltest/Makefile: $(DLTEST_DIR)/configure $(DLTEST_DIR)/Makefile.in tclConfig.sh
 
 install: install-binaries install-libraries install-man
 
+# Note: before running ranlib below, must cd to target directory because
+# some ranlibs write to current directory, and this might not always be
+# possible (e.g. if installing as root).
+
 install-binaries: $(TCL_LIB_FILE) tclsh
 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
 	    do \
@@ -360,10 +367,12 @@ install-binaries: $(TCL_LIB_FILE) tclsh
 	    done;
 	@echo "Installing $(TCL_LIB_FILE)"
 	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-	@$(RANLIB) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
 	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 	@echo "Installing tclsh"
 	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
+	@echo "Installing tclConfig.sh"
+	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 
 install-libraries:
 	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -378,8 +387,6 @@ install-libraries:
 	    done;
 	@echo "Installing tcl.h"
 	@$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
-	@echo "Installing tclConfig.sh"
-	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c; \
 	    do \
 	    echo "Installing $$i"; \
@@ -433,7 +440,7 @@ clean:
 	if test -f dltest/Makefile; then cd dltest; make clean; fi
 
 distclean: clean
-	rm -f Makefile config.* tclConfig.sh
+	rm -f Makefile config.status config.cache config.log tclConfig.sh
 	if test -f dltest/Makefile; then cd dltest; make distclean; fi
 
 depend:
@@ -676,7 +683,7 @@ checkexports: $(TCL_LIB_FILE)
 # to put the distribution.
 #
 
-DISTDIR =	/proj/tcl/dist/tcl7.5
+DISTDIR =	/proj/tcl/dist/tcl7.5p1
 configure: configure.in
 	autoconf
 dist: configure
@@ -684,6 +691,7 @@ dist: configure
 	mkdir $(DISTDIR)
 	mkdir $(DISTDIR)/unix
 	cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
+	rm -f $(DISTDIR)/unix/bp.c
 	cp Makefile.in $(DISTDIR)/unix
 	chmod 664 $(DISTDIR)/unix/Makefile.in
 	cp configure configure.in tclConfig.sh.in install-sh porting.notes \
@@ -722,6 +730,7 @@ dist: configure
 	rm -f tclMacProjects.sit.hqx
 	cp -p ../mac/*.c ../mac/*.h ../mac/*.r $(DISTDIR)/mac
 	cp -p ../mac/porting.notes ../mac/README $(DISTDIR)/mac
+	cp -p ../mac/*.doc ../mac/*.pch $(DISTDIR)/mac
 	cp -p ../license.terms $(DISTDIR)/mac
 	mkdir $(DISTDIR)/unix/dltest
 	cp -p dltest/*.c dltest/Makefile.in $(DISTDIR)/unix/dltest
diff --git a/contrib/tcl/unix/README b/contrib/tcl/unix/README
index ea1d01f..9d950e8 100644
--- a/contrib/tcl/unix/README
+++ b/contrib/tcl/unix/README
@@ -12,14 +12,19 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
 a PC running Windows, see the README file in the directory ../win.  To
 compile for a Macintosh, see the README file in the directory ../mac.
 
-SCCS: @(#) README 1.10 96/04/17 11:40:24
+SCCS: @(#) README 1.13 96/07/31 16:28:38
 
 How To Compile And Install Tcl:
 -------------------------------
 
 (a) Check for patches as described in ../README.
 
-(b) Type "./configure".  This runs a configuration script created by GNU
+(b) If you have already compiled Tcl once in this directory and are now
+    preparing to compile again in the same directory but for a different
+    platform, or if you have applied patches, type "make distclean" to
+    discard all the configuration information computed previously.
+
+(c) Type "./configure".  This runs a configuration script created by GNU
     autoconf, which configures Tcl for your system and creates a
     Makefile.  The configure script allows you to customize the Tcl
     configuration for your site; for details on how you can do this,
@@ -29,7 +34,7 @@ How To Compile And Install Tcl:
 	--enable-gcc		If this switch is set, Tcl will configure
 				itself to use gcc if it is available on your
 				system.  Note:  it is not safe to modify the
-				Makefile to use gcc after autoconf is run;
+				Makefile to use gcc after configure is run;
 				if you do this, then information related to
 				dynamic linking will be incorrect.
 	--disable-load		If this switch is specified then Tcl will
@@ -44,11 +49,11 @@ How To Compile And Install Tcl:
     Note: be sure to use only absolute path names (those starting with "/")
     in the --prefix and --exec_prefix options.
 
-(c) Type "make".  This will create a library archive called "libtcl.a"
+(d) Type "make".  This will create a library archive called "libtcl.a"
     or "libtcl.so" and an interpreter application called "tclsh" that
     allows you to type Tcl commands interactively or execute script files.
 
-(d) If the make fails then you'll have to personalize the Makefile
+(e) If the make fails then you'll have to personalize the Makefile
     for your site or possibly modify the distribution in other ways.
     First check the file "porting.notes" to see if there are hints
     for compiling on your system.  Then look at the porting Web page
@@ -56,7 +61,7 @@ How To Compile And Install Tcl:
     are comments at the beginning of it that describe the things you
     might want to change and how to change them.
 
-(e) Type "make install" to install Tcl binaries and script files in
+(f) Type "make install" to install Tcl binaries and script files in
     standard places.  You'll need write permission on the installation
     directories to do this.  The installation directories are
     determined by the "configure" script and may be specified with
@@ -65,7 +70,7 @@ How To Compile And Install Tcl:
     can override these choices by modifying the "prefix" and
     "exec_prefix" variables in the Makefile.
 
-(f) At this point you can play with Tcl by invoking the "tclsh"
+(g) At this point you can play with Tcl by invoking the "tclsh"
     program and typing Tcl commands.  However, if you haven't installed
     Tcl then you'll first need to set your TCL_LIBRARY variable to
     hold the full path name of the "library" subdirectory.  Note that
diff --git a/contrib/tcl/unix/configure b/contrib/tcl/unix/configure
index 47627f4..090fa9e 100755
--- a/contrib/tcl/unix/configure
+++ b/contrib/tcl/unix/configure
@@ -404,7 +404,7 @@ else
 fi
 
 
-# SCCS: @(#) configure.in 1.102 96/04/17 10:46:25
+# SCCS: @(#) configure.in 1.107 96/07/30 08:38:37
 
 TCL_VERSION=7.5
 TCL_MAJOR_VERSION=7
@@ -2996,7 +2996,7 @@ fi
 #	LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
 #			that tell the run-time dynamic linker where to look
 #			for shared libraries such as libtcl.so.  Depends on
-#			the variable LIB_INSTALL_DIR in the Makefile.
+#			the variable LIB_RUNTIME_DIR in the Makefile.
 #	MAKE_LIB -	Command to execute to build the Tcl library;
 #			differs depending on whether or not Tcl is being
 #			compiled as a shared library.
@@ -3127,7 +3127,7 @@ case $system in
 	DL_OBJS="tclLoadDl.o tclLoadAix.o"
 	DL_LIBS="-lld"
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-L${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 	cat >> confdefs.h <<\EOF
 #define NO_DLFCN_H 1
 EOF
@@ -3135,6 +3135,16 @@ EOF
 	AIX=yes
 	TCL_SHARED_LIB_SUFFIX='${VERSION}.a'
 	;;
+    BSD/OS-2.1*)
+	SHLIB_CFLAGS=""
+	SHLIB_LD="ld -r"
+	SHLIB_LD_FLAGS=""
+	SHLIB_SUFFIX=".so"
+	DL_OBJS="tclLoadDl.o"
+	DL_LIBS="-ldl"
+	LD_FLAGS=""
+	LD_SEARCH_FLAGS=""
+	;;
     HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
 	SHLIB_CFLAGS="+z"
 	SHLIB_LD="ld -b"
@@ -3143,7 +3153,7 @@ EOF
 	DL_OBJS="tclLoadShl.o"
 	DL_LIBS="-ldld"
 	LD_FLAGS="-Wl,-E"
-	LD_SEARCH_FLAGS='-Wl,+b,${LIB_INSTALL_DIR}:.'
+	LD_SEARCH_FLAGS='-Wl,+b,${LIB_RUNTIME_DIR}:.'
 	;;
     IRIX-4.*)
 	SHLIB_CFLAGS="-G 0"
@@ -3155,7 +3165,7 @@ EOF
 	LD_FLAGS="-Wl,-D,08000000"
 	LD_SEARCH_FLAGS=""
 	;;
-    IRIX-5.*)
+    IRIX-5.*|IRIX-6.*)
 	SHLIB_CFLAGS=""
 	SHLIB_LD="ld -shared -rdata_shared"
 	SHLIB_LD_LIBS=""
@@ -3163,7 +3173,17 @@ EOF
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS=""
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	;;
+    IRIX64-6.*)
+	SHLIB_CFLAGS=""
+	SHLIB_LD="ld -32 -shared -rdata_shared -rpath /usr/local/lib"
+	SHLIB_LD_LIBS=""
+	SHLIB_SUFFIX=".so"
+	DL_OBJS="tclLoadDl.o"
+	DL_LIBS=""
+	LD_FLAGS=""
+	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	;;
     Linux*)
 	SHLIB_CFLAGS="-fPIC"
@@ -3182,7 +3202,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3186 "configure"
+#line 3206 "configure"
 #include "confdefs.h"
 #include <dld.h>
 EOF
@@ -3240,7 +3260,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3244 "configure"
+#line 3264 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
@@ -3332,7 +3352,7 @@ fi
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS=""
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	;;
     RISCos-*)
 	SHLIB_CFLAGS="-G 0"
@@ -3375,7 +3395,7 @@ fi
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS="-ldl"
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-L${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 
 	# SunOS can't handle version numbers with dots in them in library
 	# specs, like -ltcl7.5, so use -ltcl75 instead.  Also, it
@@ -3387,14 +3407,14 @@ fi
 	TCL_LIB_VERSIONS_OK=nodots
 	;;
     SunOS-5*)
-	SHLIB_CFLAGS="-K PIC"
+	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="/usr/ccs/bin/ld -G -z text"
 	SHLIB_LD_LIBS='${LIBS}'
 	SHLIB_SUFFIX=".so"
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS="-ldl"
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-R ${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 	;;
     ULTRIX-4.*)
 	SHLIB_CFLAGS="-G 0"
@@ -3407,7 +3427,7 @@ fi
 	LD_SEARCH_FLAGS=""
 	;;
     UNIX_SV*)
-	SHLIB_CFLAGS="-K PIC"
+	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="cc -G"
 	SHLIB_LD_LIBS=""
 	SHLIB_SUFFIX=".so"
@@ -3439,7 +3459,7 @@ esac
 if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
     echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
     cat > conftest.$ac_ext <<EOF
-#line 3443 "configure"
+#line 3463 "configure"
 #include "confdefs.h"
 #include <sys/exec.h>
 int main() { return 0; }
@@ -3476,7 +3496,7 @@ EOF
     else
 	echo $ac_n "checking a.out.h""... $ac_c" 1>&6
 	cat > conftest.$ac_ext <<EOF
-#line 3480 "configure"
+#line 3500 "configure"
 #include "confdefs.h"
 #include <a.out.h>
 int main() { return 0; }
@@ -3513,7 +3533,7 @@ EOF
 	else
 	    echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
 	    cat > conftest.$ac_ext <<EOF
-#line 3517 "configure"
+#line 3537 "configure"
 #include "confdefs.h"
 #include <sys/exec_aout.h>
 int main() { return 0; }
diff --git a/contrib/tcl/unix/configure.in b/contrib/tcl/unix/configure.in
index e57218c..408c4f9 100755
--- a/contrib/tcl/unix/configure.in
+++ b/contrib/tcl/unix/configure.in
@@ -2,7 +2,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tcl.h)
-# SCCS: @(#) configure.in 1.102 96/04/17 10:46:25
+# SCCS: @(#) configure.in 1.107 96/07/30 08:38:37
 
 TCL_VERSION=7.5
 TCL_MAJOR_VERSION=7
@@ -449,7 +449,7 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 #	LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
 #			that tell the run-time dynamic linker where to look
 #			for shared libraries such as libtcl.so.  Depends on
-#			the variable LIB_INSTALL_DIR in the Makefile.
+#			the variable LIB_RUNTIME_DIR in the Makefile.
 #	MAKE_LIB -	Command to execute to build the Tcl library;
 #			differs depending on whether or not Tcl is being
 #			compiled as a shared library.
@@ -541,11 +541,21 @@ case $system in
 	DL_OBJS="tclLoadDl.o tclLoadAix.o"
 	DL_LIBS="-lld"
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-L${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 	AC_DEFINE(NO_DLFCN_H)
 	AIX=yes
 	TCL_SHARED_LIB_SUFFIX='${VERSION}.a'
 	;;
+    BSD/OS-2.1*)
+	SHLIB_CFLAGS=""
+	SHLIB_LD="ld -r"
+	SHLIB_LD_FLAGS=""
+	SHLIB_SUFFIX=".so"
+	DL_OBJS="tclLoadDl.o"
+	DL_LIBS="-ldl"
+	LD_FLAGS=""
+	LD_SEARCH_FLAGS=""
+	;;
     HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
 	SHLIB_CFLAGS="+z"
 	SHLIB_LD="ld -b"
@@ -554,7 +564,7 @@ case $system in
 	DL_OBJS="tclLoadShl.o"
 	DL_LIBS="-ldld"
 	LD_FLAGS="-Wl,-E"
-	LD_SEARCH_FLAGS='-Wl,+b,${LIB_INSTALL_DIR}:.'
+	LD_SEARCH_FLAGS='-Wl,+b,${LIB_RUNTIME_DIR}:.'
 	;;
     IRIX-4.*)
 	SHLIB_CFLAGS="-G 0"
@@ -566,7 +576,7 @@ case $system in
 	LD_FLAGS="-Wl,-D,08000000"
 	LD_SEARCH_FLAGS=""
 	;;
-    IRIX-5.*)
+    IRIX-5.*|IRIX-6.*)
 	SHLIB_CFLAGS=""
 	SHLIB_LD="ld -shared -rdata_shared"
 	SHLIB_LD_LIBS=""
@@ -574,7 +584,17 @@ case $system in
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS=""
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	;;
+    IRIX64-6.*)
+	SHLIB_CFLAGS=""
+	SHLIB_LD="ld -32 -shared -rdata_shared -rpath /usr/local/lib"
+	SHLIB_LD_LIBS=""
+	SHLIB_SUFFIX=".so"
+	DL_OBJS="tclLoadDl.o"
+	DL_LIBS=""
+	LD_FLAGS=""
+	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	;;
     Linux*)
 	SHLIB_CFLAGS="-fPIC"
@@ -686,7 +706,7 @@ case $system in
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS=""
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	;;
     RISCos-*)
 	SHLIB_CFLAGS="-G 0"
@@ -729,7 +749,7 @@ case $system in
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS="-ldl"
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-L${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 
 	# SunOS can't handle version numbers with dots in them in library
 	# specs, like -ltcl7.5, so use -ltcl75 instead.  Also, it
@@ -741,14 +761,14 @@ case $system in
 	TCL_LIB_VERSIONS_OK=nodots
 	;;
     SunOS-5*)
-	SHLIB_CFLAGS="-K PIC"
+	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="/usr/ccs/bin/ld -G -z text"
 	SHLIB_LD_LIBS='${LIBS}'
 	SHLIB_SUFFIX=".so"
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS="-ldl"
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-R ${LIB_INSTALL_DIR}'
+	LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 	;;
     ULTRIX-4.*)
 	SHLIB_CFLAGS="-G 0"
@@ -761,7 +781,7 @@ case $system in
 	LD_SEARCH_FLAGS=""
 	;;
     UNIX_SV*)
-	SHLIB_CFLAGS="-K PIC"
+	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="cc -G"
 	SHLIB_LD_LIBS=""
 	SHLIB_SUFFIX=".so"
diff --git a/contrib/tcl/unix/mkLinks b/contrib/tcl/unix/mkLinks
index 149fcba..93b577d 100755
--- a/contrib/tcl/unix/mkLinks
+++ b/contrib/tcl/unix/mkLinks
@@ -20,690 +20,715 @@ if test $# != 1; then
     exit 1
 fi
 
-echo foo >  xyzzyTestingAVeryLongFileName.foo
+cd $1
+echo foo > xyzzyTestingAVeryLongFileName.foo
 x=`echo xyzzyTe*`
 rm xyzzyTe*
 if test "$x" != "xyzzyTestingAVeryLongFileName.foo"; then
     exit
 fi
-if test -r $1/AddErrInfo.3; then
-    rm -f $1/Tcl_AddErrorInfo.3
-    ln $1/AddErrInfo.3 $1/Tcl_AddErrorInfo.3
+if test -r AddErrInfo.3; then
+    rm -f Tcl_AddErrorInfo.3
+    ln AddErrInfo.3 Tcl_AddErrorInfo.3
 fi
-if test -r $1/AllowExc.3; then
-    rm -f $1/Tcl_AllowExceptions.3
-    ln $1/AllowExc.3 $1/Tcl_AllowExceptions.3
+if test -r Alloc.3; then
+    rm -f Tcl_Alloc.3
+    ln Alloc.3 Tcl_Alloc.3
 fi
-if test -r $1/AppInit.3; then
-    rm -f $1/Tcl_AppInit.3
-    ln $1/AppInit.3 $1/Tcl_AppInit.3
+if test -r AllowExc.3; then
+    rm -f Tcl_AllowExceptions.3
+    ln AllowExc.3 Tcl_AllowExceptions.3
 fi
-if test -r $1/SetResult.3; then
-    rm -f $1/Tcl_AppendElement.3
-    ln $1/SetResult.3 $1/Tcl_AppendElement.3
+if test -r AppInit.3; then
+    rm -f Tcl_AppInit.3
+    ln AppInit.3 Tcl_AppInit.3
 fi
-if test -r $1/SetResult.3; then
-    rm -f $1/Tcl_AppendResult.3
-    ln $1/SetResult.3 $1/Tcl_AppendResult.3
+if test -r SetResult.3; then
+    rm -f Tcl_AppendElement.3
+    ln SetResult.3 Tcl_AppendElement.3
 fi
-if test -r $1/Async.3; then
-    rm -f $1/Tcl_AsyncCreate.3
-    ln $1/Async.3 $1/Tcl_AsyncCreate.3
+if test -r SetResult.3; then
+    rm -f Tcl_AppendResult.3
+    ln SetResult.3 Tcl_AppendResult.3
 fi
-if test -r $1/Async.3; then
-    rm -f $1/Tcl_AsyncDelete.3
-    ln $1/Async.3 $1/Tcl_AsyncDelete.3
+if test -r Async.3; then
+    rm -f Tcl_AsyncCreate.3
+    ln Async.3 Tcl_AsyncCreate.3
 fi
-if test -r $1/Async.3; then
-    rm -f $1/Tcl_AsyncInvoke.3
-    ln $1/Async.3 $1/Tcl_AsyncInvoke.3
+if test -r Async.3; then
+    rm -f Tcl_AsyncDelete.3
+    ln Async.3 Tcl_AsyncDelete.3
 fi
-if test -r $1/Async.3; then
-    rm -f $1/Tcl_AsyncMark.3
-    ln $1/Async.3 $1/Tcl_AsyncMark.3
+if test -r Async.3; then
+    rm -f Tcl_AsyncInvoke.3
+    ln Async.3 Tcl_AsyncInvoke.3
 fi
-if test -r $1/BackgdErr.3; then
-    rm -f $1/Tcl_BackgroundError.3
-    ln $1/BackgdErr.3 $1/Tcl_BackgroundError.3
+if test -r Async.3; then
+    rm -f Tcl_AsyncMark.3
+    ln Async.3 Tcl_AsyncMark.3
 fi
-if test -r $1/Backslash.3; then
-    rm -f $1/Tcl_Backslash.3
-    ln $1/Backslash.3 $1/Tcl_Backslash.3
+if test -r BackgdErr.3; then
+    rm -f Tcl_BackgroundError.3
+    ln BackgdErr.3 Tcl_BackgroundError.3
 fi
-if test -r $1/CallDel.3; then
-    rm -f $1/Tcl_CallWhenDeleted.3
-    ln $1/CallDel.3 $1/Tcl_CallWhenDeleted.3
+if test -r Backslash.3; then
+    rm -f Tcl_Backslash.3
+    ln Backslash.3 Tcl_Backslash.3
 fi
-if test -r $1/DoWhenIdle.3; then
-    rm -f $1/Tcl_CancelIdleCall.3
-    ln $1/DoWhenIdle.3 $1/Tcl_CancelIdleCall.3
+if test -r CallDel.3; then
+    rm -f Tcl_CallWhenDeleted.3
+    ln CallDel.3 Tcl_CallWhenDeleted.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Close.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Close.3
+if test -r DoWhenIdle.3; then
+    rm -f Tcl_CancelIdleCall.3
+    ln DoWhenIdle.3 Tcl_CancelIdleCall.3
 fi
-if test -r $1/CmdCmplt.3; then
-    rm -f $1/Tcl_CommandComplete.3
-    ln $1/CmdCmplt.3 $1/Tcl_CommandComplete.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Close.3
+    ln OpenFileChnl.3 Tcl_Close.3
 fi
-if test -r $1/Concat.3; then
-    rm -f $1/Tcl_Concat.3
-    ln $1/Concat.3 $1/Tcl_Concat.3
+if test -r CmdCmplt.3; then
+    rm -f Tcl_CommandComplete.3
+    ln CmdCmplt.3 Tcl_CommandComplete.3
 fi
-if test -r $1/SplitList.3; then
-    rm -f $1/Tcl_ConvertElement.3
-    ln $1/SplitList.3 $1/Tcl_ConvertElement.3
+if test -r Concat.3; then
+    rm -f Tcl_Concat.3
+    ln Concat.3 Tcl_Concat.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_CreateAlias.3
-    ln $1/CrtSlave.3 $1/Tcl_CreateAlias.3
+if test -r SplitList.3; then
+    rm -f Tcl_ConvertElement.3
+    ln SplitList.3 Tcl_ConvertElement.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_CreateChannel.3
-    ln $1/CrtChannel.3 $1/Tcl_CreateChannel.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_CreateAlias.3
+    ln CrtSlave.3 Tcl_CreateAlias.3
 fi
-if test -r $1/CrtChnlHdlr.3; then
-    rm -f $1/Tcl_CreateChannelHandler.3
-    ln $1/CrtChnlHdlr.3 $1/Tcl_CreateChannelHandler.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_CreateChannel.3
+    ln CrtChannel.3 Tcl_CreateChannel.3
 fi
-if test -r $1/CrtCloseHdlr.3; then
-    rm -f $1/Tcl_CreateCloseHandler.3
-    ln $1/CrtCloseHdlr.3 $1/Tcl_CreateCloseHandler.3
+if test -r CrtChnlHdlr.3; then
+    rm -f Tcl_CreateChannelHandler.3
+    ln CrtChnlHdlr.3 Tcl_CreateChannelHandler.3
 fi
-if test -r $1/CrtCommand.3; then
-    rm -f $1/Tcl_CreateCommand.3
-    ln $1/CrtCommand.3 $1/Tcl_CreateCommand.3
+if test -r CrtCloseHdlr.3; then
+    rm -f Tcl_CreateCloseHandler.3
+    ln CrtCloseHdlr.3 Tcl_CreateCloseHandler.3
 fi
-if test -r $1/Notifier.3; then
-    rm -f $1/Tcl_CreateEventSource.3
-    ln $1/Notifier.3 $1/Tcl_CreateEventSource.3
+if test -r CrtCommand.3; then
+    rm -f Tcl_CreateCommand.3
+    ln CrtCommand.3 Tcl_CreateCommand.3
 fi
-if test -r $1/Exit.3; then
-    rm -f $1/Tcl_CreateExitHandler.3
-    ln $1/Exit.3 $1/Tcl_CreateExitHandler.3
+if test -r Notifier.3; then
+    rm -f Tcl_CreateEventSource.3
+    ln Notifier.3 Tcl_CreateEventSource.3
 fi
-if test -r $1/CrtFileHdlr.3; then
-    rm -f $1/Tcl_CreateFileHandler.3
-    ln $1/CrtFileHdlr.3 $1/Tcl_CreateFileHandler.3
+if test -r Exit.3; then
+    rm -f Tcl_CreateExitHandler.3
+    ln Exit.3 Tcl_CreateExitHandler.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_CreateHashEntry.3
-    ln $1/Hash.3 $1/Tcl_CreateHashEntry.3
+if test -r CrtFileHdlr.3; then
+    rm -f Tcl_CreateFileHandler.3
+    ln CrtFileHdlr.3 Tcl_CreateFileHandler.3
 fi
-if test -r $1/CrtInterp.3; then
-    rm -f $1/Tcl_CreateInterp.3
-    ln $1/CrtInterp.3 $1/Tcl_CreateInterp.3
+if test -r Hash.3; then
+    rm -f Tcl_CreateHashEntry.3
+    ln Hash.3 Tcl_CreateHashEntry.3
 fi
-if test -r $1/CrtMathFnc.3; then
-    rm -f $1/Tcl_CreateMathFunc.3
-    ln $1/CrtMathFnc.3 $1/Tcl_CreateMathFunc.3
+if test -r CrtInterp.3; then
+    rm -f Tcl_CreateInterp.3
+    ln CrtInterp.3 Tcl_CreateInterp.3
 fi
-if test -r $1/CrtModalTmt.3; then
-    rm -f $1/Tcl_CreateModalTimeout.3
-    ln $1/CrtModalTmt.3 $1/Tcl_CreateModalTimeout.3
+if test -r CrtMathFnc.3; then
+    rm -f Tcl_CreateMathFunc.3
+    ln CrtMathFnc.3 Tcl_CreateMathFunc.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_CreateSlave.3
-    ln $1/CrtSlave.3 $1/Tcl_CreateSlave.3
+if test -r CrtModalTmt.3; then
+    rm -f Tcl_CreateModalTimeout.3
+    ln CrtModalTmt.3 Tcl_CreateModalTimeout.3
 fi
-if test -r $1/CrtTimerHdlr.3; then
-    rm -f $1/Tcl_CreateTimerHandler.3
-    ln $1/CrtTimerHdlr.3 $1/Tcl_CreateTimerHandler.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_CreateSlave.3
+    ln CrtSlave.3 Tcl_CreateSlave.3
 fi
-if test -r $1/CrtTrace.3; then
-    rm -f $1/Tcl_CreateTrace.3
-    ln $1/CrtTrace.3 $1/Tcl_CreateTrace.3
+if test -r CrtTimerHdlr.3; then
+    rm -f Tcl_CreateTimerHandler.3
+    ln CrtTimerHdlr.3 Tcl_CreateTimerHandler.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringAppend.3
-    ln $1/DString.3 $1/Tcl_DStringAppend.3
+if test -r CrtTrace.3; then
+    rm -f Tcl_CreateTrace.3
+    ln CrtTrace.3 Tcl_CreateTrace.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringAppendElement.3
-    ln $1/DString.3 $1/Tcl_DStringAppendElement.3
+if test -r DString.3; then
+    rm -f Tcl_DStringAppend.3
+    ln DString.3 Tcl_DStringAppend.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringEndSublist.3
-    ln $1/DString.3 $1/Tcl_DStringEndSublist.3
+if test -r DString.3; then
+    rm -f Tcl_DStringAppendElement.3
+    ln DString.3 Tcl_DStringAppendElement.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringFree.3
-    ln $1/DString.3 $1/Tcl_DStringFree.3
+if test -r DString.3; then
+    rm -f Tcl_DStringEndSublist.3
+    ln DString.3 Tcl_DStringEndSublist.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringGetResult.3
-    ln $1/DString.3 $1/Tcl_DStringGetResult.3
+if test -r DString.3; then
+    rm -f Tcl_DStringFree.3
+    ln DString.3 Tcl_DStringFree.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringInit.3
-    ln $1/DString.3 $1/Tcl_DStringInit.3
+if test -r DString.3; then
+    rm -f Tcl_DStringGetResult.3
+    ln DString.3 Tcl_DStringGetResult.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringLength.3
-    ln $1/DString.3 $1/Tcl_DStringLength.3
+if test -r DString.3; then
+    rm -f Tcl_DStringInit.3
+    ln DString.3 Tcl_DStringInit.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringResult.3
-    ln $1/DString.3 $1/Tcl_DStringResult.3
+if test -r DString.3; then
+    rm -f Tcl_DStringLength.3
+    ln DString.3 Tcl_DStringLength.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringSetLength.3
-    ln $1/DString.3 $1/Tcl_DStringSetLength.3
+if test -r DString.3; then
+    rm -f Tcl_DStringResult.3
+    ln DString.3 Tcl_DStringResult.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringStartSublist.3
-    ln $1/DString.3 $1/Tcl_DStringStartSublist.3
+if test -r DString.3; then
+    rm -f Tcl_DStringSetLength.3
+    ln DString.3 Tcl_DStringSetLength.3
 fi
-if test -r $1/DString.3; then
-    rm -f $1/Tcl_DStringValue.3
-    ln $1/DString.3 $1/Tcl_DStringValue.3
+if test -r DString.3; then
+    rm -f Tcl_DStringStartSublist.3
+    ln DString.3 Tcl_DStringStartSublist.3
 fi
-if test -r $1/AssocData.3; then
-    rm -f $1/Tcl_DeleteAssocData.3
-    ln $1/AssocData.3 $1/Tcl_DeleteAssocData.3
+if test -r DString.3; then
+    rm -f Tcl_DStringValue.3
+    ln DString.3 Tcl_DStringValue.3
 fi
-if test -r $1/CrtChnlHdlr.3; then
-    rm -f $1/Tcl_DeleteChannelHandler.3
-    ln $1/CrtChnlHdlr.3 $1/Tcl_DeleteChannelHandler.3
+if test -r AssocData.3; then
+    rm -f Tcl_DeleteAssocData.3
+    ln AssocData.3 Tcl_DeleteAssocData.3
 fi
-if test -r $1/CrtCloseHdlr.3; then
-    rm -f $1/Tcl_DeleteCloseHandler.3
-    ln $1/CrtCloseHdlr.3 $1/Tcl_DeleteCloseHandler.3
+if test -r CrtChnlHdlr.3; then
+    rm -f Tcl_DeleteChannelHandler.3
+    ln CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3
 fi
-if test -r $1/CrtCommand.3; then
-    rm -f $1/Tcl_DeleteCommand.3
-    ln $1/CrtCommand.3 $1/Tcl_DeleteCommand.3
+if test -r CrtCloseHdlr.3; then
+    rm -f Tcl_DeleteCloseHandler.3
+    ln CrtCloseHdlr.3 Tcl_DeleteCloseHandler.3
 fi
-if test -r $1/Notifier.3; then
-    rm -f $1/Tcl_DeleteEventSource.3
-    ln $1/Notifier.3 $1/Tcl_DeleteEventSource.3
+if test -r CrtCommand.3; then
+    rm -f Tcl_DeleteCommand.3
+    ln CrtCommand.3 Tcl_DeleteCommand.3
 fi
-if test -r $1/Exit.3; then
-    rm -f $1/Tcl_DeleteExitHandler.3
-    ln $1/Exit.3 $1/Tcl_DeleteExitHandler.3
+if test -r Notifier.3; then
+    rm -f Tcl_DeleteEventSource.3
+    ln Notifier.3 Tcl_DeleteEventSource.3
 fi
-if test -r $1/CrtFileHdlr.3; then
-    rm -f $1/Tcl_DeleteFileHandler.3
-    ln $1/CrtFileHdlr.3 $1/Tcl_DeleteFileHandler.3
+if test -r Exit.3; then
+    rm -f Tcl_DeleteExitHandler.3
+    ln Exit.3 Tcl_DeleteExitHandler.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_DeleteHashEntry.3
-    ln $1/Hash.3 $1/Tcl_DeleteHashEntry.3
+if test -r CrtFileHdlr.3; then
+    rm -f Tcl_DeleteFileHandler.3
+    ln CrtFileHdlr.3 Tcl_DeleteFileHandler.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_DeleteHashTable.3
-    ln $1/Hash.3 $1/Tcl_DeleteHashTable.3
+if test -r Hash.3; then
+    rm -f Tcl_DeleteHashEntry.3
+    ln Hash.3 Tcl_DeleteHashEntry.3
 fi
-if test -r $1/CrtInterp.3; then
-    rm -f $1/Tcl_DeleteInterp.3
-    ln $1/CrtInterp.3 $1/Tcl_DeleteInterp.3
+if test -r Hash.3; then
+    rm -f Tcl_DeleteHashTable.3
+    ln Hash.3 Tcl_DeleteHashTable.3
 fi
-if test -r $1/CrtModalTmt.3; then
-    rm -f $1/Tcl_DeleteModalTimeout.3
-    ln $1/CrtModalTmt.3 $1/Tcl_DeleteModalTimeout.3
+if test -r CrtInterp.3; then
+    rm -f Tcl_DeleteInterp.3
+    ln CrtInterp.3 Tcl_DeleteInterp.3
 fi
-if test -r $1/CrtTimerHdlr.3; then
-    rm -f $1/Tcl_DeleteTimerHandler.3
-    ln $1/CrtTimerHdlr.3 $1/Tcl_DeleteTimerHandler.3
+if test -r CrtModalTmt.3; then
+    rm -f Tcl_DeleteModalTimeout.3
+    ln CrtModalTmt.3 Tcl_DeleteModalTimeout.3
 fi
-if test -r $1/CrtTrace.3; then
-    rm -f $1/Tcl_DeleteTrace.3
-    ln $1/CrtTrace.3 $1/Tcl_DeleteTrace.3
+if test -r CrtTimerHdlr.3; then
+    rm -f Tcl_DeleteTimerHandler.3
+    ln CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3
 fi
-if test -r $1/DetachPids.3; then
-    rm -f $1/Tcl_DetachPids.3
-    ln $1/DetachPids.3 $1/Tcl_DetachPids.3
+if test -r CrtTrace.3; then
+    rm -f Tcl_DeleteTrace.3
+    ln CrtTrace.3 Tcl_DeleteTrace.3
 fi
-if test -r $1/DoOneEvent.3; then
-    rm -f $1/Tcl_DoOneEvent.3
-    ln $1/DoOneEvent.3 $1/Tcl_DoOneEvent.3
+if test -r DetachPids.3; then
+    rm -f Tcl_DetachPids.3
+    ln DetachPids.3 Tcl_DetachPids.3
 fi
-if test -r $1/DoWhenIdle.3; then
-    rm -f $1/Tcl_DoWhenIdle.3
-    ln $1/DoWhenIdle.3 $1/Tcl_DoWhenIdle.3
+if test -r DoOneEvent.3; then
+    rm -f Tcl_DoOneEvent.3
+    ln DoOneEvent.3 Tcl_DoOneEvent.3
 fi
-if test -r $1/CallDel.3; then
-    rm -f $1/Tcl_DontCallWhenDeleted.3
-    ln $1/CallDel.3 $1/Tcl_DontCallWhenDeleted.3
+if test -r DoWhenIdle.3; then
+    rm -f Tcl_DoWhenIdle.3
+    ln DoWhenIdle.3 Tcl_DoWhenIdle.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Eof.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Eof.3
+if test -r CallDel.3; then
+    rm -f Tcl_DontCallWhenDeleted.3
+    ln CallDel.3 Tcl_DontCallWhenDeleted.3
 fi
-if test -r $1/Eval.3; then
-    rm -f $1/Tcl_Eval.3
-    ln $1/Eval.3 $1/Tcl_Eval.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Eof.3
+    ln OpenFileChnl.3 Tcl_Eof.3
 fi
-if test -r $1/Eval.3; then
-    rm -f $1/Tcl_EvalFile.3
-    ln $1/Eval.3 $1/Tcl_EvalFile.3
+if test -r Eval.3; then
+    rm -f Tcl_Eval.3
+    ln Eval.3 Tcl_Eval.3
 fi
-if test -r $1/Preserve.3; then
-    rm -f $1/Tcl_EventuallyFree.3
-    ln $1/Preserve.3 $1/Tcl_EventuallyFree.3
+if test -r Eval.3; then
+    rm -f Tcl_EvalFile.3
+    ln Eval.3 Tcl_EvalFile.3
 fi
-if test -r $1/Exit.3; then
-    rm -f $1/Tcl_Exit.3
-    ln $1/Exit.3 $1/Tcl_Exit.3
+if test -r Preserve.3; then
+    rm -f Tcl_EventuallyFree.3
+    ln Preserve.3 Tcl_EventuallyFree.3
 fi
-if test -r $1/ExprLong.3; then
-    rm -f $1/Tcl_ExprBoolean.3
-    ln $1/ExprLong.3 $1/Tcl_ExprBoolean.3
+if test -r Exit.3; then
+    rm -f Tcl_Exit.3
+    ln Exit.3 Tcl_Exit.3
 fi
-if test -r $1/ExprLong.3; then
-    rm -f $1/Tcl_ExprDouble.3
-    ln $1/ExprLong.3 $1/Tcl_ExprDouble.3
+if test -r ExprLong.3; then
+    rm -f Tcl_ExprBoolean.3
+    ln ExprLong.3 Tcl_ExprBoolean.3
 fi
-if test -r $1/ExprLong.3; then
-    rm -f $1/Tcl_ExprLong.3
-    ln $1/ExprLong.3 $1/Tcl_ExprLong.3
+if test -r ExprLong.3; then
+    rm -f Tcl_ExprDouble.3
+    ln ExprLong.3 Tcl_ExprDouble.3
 fi
-if test -r $1/ExprLong.3; then
-    rm -f $1/Tcl_ExprString.3
-    ln $1/ExprLong.3 $1/Tcl_ExprString.3
+if test -r ExprLong.3; then
+    rm -f Tcl_ExprLong.3
+    ln ExprLong.3 Tcl_ExprLong.3
 fi
-if test -r $1/Notifier.3; then
-    rm -f $1/Tcl_FileReady.3
-    ln $1/Notifier.3 $1/Tcl_FileReady.3
+if test -r ExprLong.3; then
+    rm -f Tcl_ExprString.3
+    ln ExprLong.3 Tcl_ExprString.3
 fi
-if test -r $1/FindExec.3; then
-    rm -f $1/Tcl_FindExecutable.3
-    ln $1/FindExec.3 $1/Tcl_FindExecutable.3
+if test -r Notifier.3; then
+    rm -f Tcl_FileReady.3
+    ln Notifier.3 Tcl_FileReady.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_FindHashEntry.3
-    ln $1/Hash.3 $1/Tcl_FindHashEntry.3
+if test -r FindExec.3; then
+    rm -f Tcl_FindExecutable.3
+    ln FindExec.3 Tcl_FindExecutable.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_FirstHashEntry.3
-    ln $1/Hash.3 $1/Tcl_FirstHashEntry.3
+if test -r Hash.3; then
+    rm -f Tcl_FindHashEntry.3
+    ln Hash.3 Tcl_FindHashEntry.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Flush.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Flush.3
+if test -r Hash.3; then
+    rm -f Tcl_FirstHashEntry.3
+    ln Hash.3 Tcl_FirstHashEntry.3
 fi
-if test -r $1/GetFile.3; then
-    rm -f $1/Tcl_FreeFile.3
-    ln $1/GetFile.3 $1/Tcl_FreeFile.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Flush.3
+    ln OpenFileChnl.3 Tcl_Flush.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_GetAlias.3
-    ln $1/CrtSlave.3 $1/Tcl_GetAlias.3
+if test -r Alloc.3; then
+    rm -f Tcl_Free.3
+    ln Alloc.3 Tcl_Free.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_GetAliases.3
-    ln $1/CrtSlave.3 $1/Tcl_GetAliases.3
+if test -r GetFile.3; then
+    rm -f Tcl_FreeFile.3
+    ln GetFile.3 Tcl_FreeFile.3
 fi
-if test -r $1/AssocData.3; then
-    rm -f $1/Tcl_GetAssocData.3
-    ln $1/AssocData.3 $1/Tcl_GetAssocData.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_GetAlias.3
+    ln CrtSlave.3 Tcl_GetAlias.3
 fi
-if test -r $1/GetInt.3; then
-    rm -f $1/Tcl_GetBoolean.3
-    ln $1/GetInt.3 $1/Tcl_GetBoolean.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_GetAliases.3
+    ln CrtSlave.3 Tcl_GetAliases.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_GetChannelBufferSize.3
-    ln $1/CrtChannel.3 $1/Tcl_GetChannelBufferSize.3
+if test -r AssocData.3; then
+    rm -f Tcl_GetAssocData.3
+    ln AssocData.3 Tcl_GetAssocData.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_GetChannelFile.3
-    ln $1/CrtChannel.3 $1/Tcl_GetChannelFile.3
+if test -r GetInt.3; then
+    rm -f Tcl_GetBoolean.3
+    ln GetInt.3 Tcl_GetBoolean.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_GetChannelInstanceData.3
-    ln $1/CrtChannel.3 $1/Tcl_GetChannelInstanceData.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_GetChannelBufferSize.3
+    ln CrtChannel.3 Tcl_GetChannelBufferSize.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_GetChannelName.3
-    ln $1/CrtChannel.3 $1/Tcl_GetChannelName.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_GetChannelFile.3
+    ln CrtChannel.3 Tcl_GetChannelFile.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_GetChannelOption.3
-    ln $1/OpenFileChnl.3 $1/Tcl_GetChannelOption.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_GetChannelInstanceData.3
+    ln CrtChannel.3 Tcl_GetChannelInstanceData.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_GetChannelType.3
-    ln $1/CrtChannel.3 $1/Tcl_GetChannelType.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_GetChannelName.3
+    ln CrtChannel.3 Tcl_GetChannelName.3
 fi
-if test -r $1/CrtCommand.3; then
-    rm -f $1/Tcl_GetCommandInfo.3
-    ln $1/CrtCommand.3 $1/Tcl_GetCommandInfo.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_GetChannelOption.3
+    ln OpenFileChnl.3 Tcl_GetChannelOption.3
 fi
-if test -r $1/GetInt.3; then
-    rm -f $1/Tcl_GetDouble.3
-    ln $1/GetInt.3 $1/Tcl_GetDouble.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_GetChannelType.3
+    ln CrtChannel.3 Tcl_GetChannelType.3
 fi
-if test -r $1/SetErrno.3; then
-    rm -f $1/Tcl_GetErrno.3
-    ln $1/SetErrno.3 $1/Tcl_GetErrno.3
+if test -r CrtCommand.3; then
+    rm -f Tcl_GetCommandInfo.3
+    ln CrtCommand.3 Tcl_GetCommandInfo.3
 fi
-if test -r $1/GetFile.3; then
-    rm -f $1/Tcl_GetFile.3
-    ln $1/GetFile.3 $1/Tcl_GetFile.3
+if test -r GetInt.3; then
+    rm -f Tcl_GetDouble.3
+    ln GetInt.3 Tcl_GetDouble.3
 fi
-if test -r $1/GetFile.3; then
-    rm -f $1/Tcl_GetFileInfo.3
-    ln $1/GetFile.3 $1/Tcl_GetFileInfo.3
+if test -r SetErrno.3; then
+    rm -f Tcl_GetErrno.3
+    ln SetErrno.3 Tcl_GetErrno.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_GetHashKey.3
-    ln $1/Hash.3 $1/Tcl_GetHashKey.3
+if test -r GetFile.3; then
+    rm -f Tcl_GetFile.3
+    ln GetFile.3 Tcl_GetFile.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_GetHashValue.3
-    ln $1/Hash.3 $1/Tcl_GetHashValue.3
+if test -r GetFile.3; then
+    rm -f Tcl_GetFileInfo.3
+    ln GetFile.3 Tcl_GetFileInfo.3
 fi
-if test -r $1/GetInt.3; then
-    rm -f $1/Tcl_GetInt.3
-    ln $1/GetInt.3 $1/Tcl_GetInt.3
+if test -r Hash.3; then
+    rm -f Tcl_GetHashKey.3
+    ln Hash.3 Tcl_GetHashKey.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_GetMaster.3
-    ln $1/CrtSlave.3 $1/Tcl_GetMaster.3
+if test -r Hash.3; then
+    rm -f Tcl_GetHashValue.3
+    ln Hash.3 Tcl_GetHashValue.3
 fi
-if test -r $1/GetOpnFl.3; then
-    rm -f $1/Tcl_GetOpenFile.3
-    ln $1/GetOpnFl.3 $1/Tcl_GetOpenFile.3
+if test -r GetInt.3; then
+    rm -f Tcl_GetInt.3
+    ln GetInt.3 Tcl_GetInt.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_GetSlave.3
-    ln $1/CrtSlave.3 $1/Tcl_GetSlave.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_GetMaster.3
+    ln CrtSlave.3 Tcl_GetMaster.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_GetSlaves.3
-    ln $1/CrtSlave.3 $1/Tcl_GetSlaves.3
+if test -r GetOpnFl.3; then
+    rm -f Tcl_GetOpenFile.3
+    ln GetOpnFl.3 Tcl_GetOpenFile.3
 fi
-if test -r $1/GetStdChan.3; then
-    rm -f $1/Tcl_GetStdChannel.3
-    ln $1/GetStdChan.3 $1/Tcl_GetStdChannel.3
+if test -r SplitPath.3; then
+    rm -f Tcl_GetPathType.3
+    ln SplitPath.3 Tcl_GetPathType.3
 fi
-if test -r $1/SetVar.3; then
-    rm -f $1/Tcl_GetVar.3
-    ln $1/SetVar.3 $1/Tcl_GetVar.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_GetSlave.3
+    ln CrtSlave.3 Tcl_GetSlave.3
 fi
-if test -r $1/SetVar.3; then
-    rm -f $1/Tcl_GetVar2.3
-    ln $1/SetVar.3 $1/Tcl_GetVar2.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_GetSlaves.3
+    ln CrtSlave.3 Tcl_GetSlaves.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Gets.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Gets.3
+if test -r GetStdChan.3; then
+    rm -f Tcl_GetStdChannel.3
+    ln GetStdChan.3 Tcl_GetStdChannel.3
 fi
-if test -r $1/Eval.3; then
-    rm -f $1/Tcl_GlobalEval.3
-    ln $1/Eval.3 $1/Tcl_GlobalEval.3
+if test -r SetVar.3; then
+    rm -f Tcl_GetVar.3
+    ln SetVar.3 Tcl_GetVar.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_HashStats.3
-    ln $1/Hash.3 $1/Tcl_HashStats.3
+if test -r SetVar.3; then
+    rm -f Tcl_GetVar2.3
+    ln SetVar.3 Tcl_GetVar2.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_InitHashTable.3
-    ln $1/Hash.3 $1/Tcl_InitHashTable.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Gets.3
+    ln OpenFileChnl.3 Tcl_Gets.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_InputBlocked.3
-    ln $1/OpenFileChnl.3 $1/Tcl_InputBlocked.3
+if test -r Eval.3; then
+    rm -f Tcl_GlobalEval.3
+    ln Eval.3 Tcl_GlobalEval.3
 fi
-if test -r $1/Interp.3; then
-    rm -f $1/Tcl_Interp.3
-    ln $1/Interp.3 $1/Tcl_Interp.3
+if test -r Hash.3; then
+    rm -f Tcl_HashStats.3
+    ln Hash.3 Tcl_HashStats.3
 fi
-if test -r $1/CrtInterp.3; then
-    rm -f $1/Tcl_InterpDeleted.3
-    ln $1/CrtInterp.3 $1/Tcl_InterpDeleted.3
+if test -r Hash.3; then
+    rm -f Tcl_InitHashTable.3
+    ln Hash.3 Tcl_InitHashTable.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_IsSafe.3
-    ln $1/CrtSlave.3 $1/Tcl_IsSafe.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_InputBlocked.3
+    ln OpenFileChnl.3 Tcl_InputBlocked.3
 fi
-if test -r $1/LinkVar.3; then
-    rm -f $1/Tcl_LinkVar.3
-    ln $1/LinkVar.3 $1/Tcl_LinkVar.3
+if test -r Interp.3; then
+    rm -f Tcl_Interp.3
+    ln Interp.3 Tcl_Interp.3
 fi
-if test -r $1/CrtSlave.3; then
-    rm -f $1/Tcl_MakeSafe.3
-    ln $1/CrtSlave.3 $1/Tcl_MakeSafe.3
+if test -r CrtInterp.3; then
+    rm -f Tcl_InterpDeleted.3
+    ln CrtInterp.3 Tcl_InterpDeleted.3
 fi
-if test -r $1/SplitList.3; then
-    rm -f $1/Tcl_Merge.3
-    ln $1/SplitList.3 $1/Tcl_Merge.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_IsSafe.3
+    ln CrtSlave.3 Tcl_IsSafe.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_NextHashEntry.3
-    ln $1/Hash.3 $1/Tcl_NextHashEntry.3
+if test -r SplitPath.3; then
+    rm -f Tcl_JoinPath.3
+    ln SplitPath.3 Tcl_JoinPath.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_OpenCommandChannel.3
-    ln $1/OpenFileChnl.3 $1/Tcl_OpenCommandChannel.3
+if test -r LinkVar.3; then
+    rm -f Tcl_LinkVar.3
+    ln LinkVar.3 Tcl_LinkVar.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_OpenFileChannel.3
-    ln $1/OpenFileChnl.3 $1/Tcl_OpenFileChannel.3
+if test -r CrtSlave.3; then
+    rm -f Tcl_MakeSafe.3
+    ln CrtSlave.3 Tcl_MakeSafe.3
 fi
-if test -r $1/OpenTcp.3; then
-    rm -f $1/Tcl_OpenTcpClient.3
-    ln $1/OpenTcp.3 $1/Tcl_OpenTcpClient.3
+if test -r SplitList.3; then
+    rm -f Tcl_Merge.3
+    ln SplitList.3 Tcl_Merge.3
 fi
-if test -r $1/OpenTcp.3; then
-    rm -f $1/Tcl_OpenTcpServer.3
-    ln $1/OpenTcp.3 $1/Tcl_OpenTcpServer.3
+if test -r Hash.3; then
+    rm -f Tcl_NextHashEntry.3
+    ln Hash.3 Tcl_NextHashEntry.3
 fi
-if test -r $1/PkgRequire.3; then
-    rm -f $1/Tcl_PkgProvide.3
-    ln $1/PkgRequire.3 $1/Tcl_PkgProvide.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_OpenCommandChannel.3
+    ln OpenFileChnl.3 Tcl_OpenCommandChannel.3
 fi
-if test -r $1/PkgRequire.3; then
-    rm -f $1/Tcl_PkgRequire.3
-    ln $1/PkgRequire.3 $1/Tcl_PkgRequire.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_OpenFileChannel.3
+    ln OpenFileChnl.3 Tcl_OpenFileChannel.3
 fi
-if test -r $1/AddErrInfo.3; then
-    rm -f $1/Tcl_PosixError.3
-    ln $1/AddErrInfo.3 $1/Tcl_PosixError.3
+if test -r OpenTcp.3; then
+    rm -f Tcl_OpenTcpClient.3
+    ln OpenTcp.3 Tcl_OpenTcpClient.3
 fi
-if test -r $1/Preserve.3; then
-    rm -f $1/Tcl_Preserve.3
-    ln $1/Preserve.3 $1/Tcl_Preserve.3
+if test -r OpenTcp.3; then
+    rm -f Tcl_OpenTcpServer.3
+    ln OpenTcp.3 Tcl_OpenTcpServer.3
 fi
-if test -r $1/PrintDbl.3; then
-    rm -f $1/Tcl_PrintDouble.3
-    ln $1/PrintDbl.3 $1/Tcl_PrintDouble.3
+if test -r PkgRequire.3; then
+    rm -f Tcl_PkgProvide.3
+    ln PkgRequire.3 Tcl_PkgProvide.3
 fi
-if test -r $1/Notifier.3; then
-    rm -f $1/Tcl_QueueEvent.3
-    ln $1/Notifier.3 $1/Tcl_QueueEvent.3
+if test -r PkgRequire.3; then
+    rm -f Tcl_PkgRequire.3
+    ln PkgRequire.3 Tcl_PkgRequire.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Read.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Read.3
+if test -r AddErrInfo.3; then
+    rm -f Tcl_PosixError.3
+    ln AddErrInfo.3 Tcl_PosixError.3
 fi
-if test -r $1/DetachPids.3; then
-    rm -f $1/Tcl_ReapDetachedProcs.3
-    ln $1/DetachPids.3 $1/Tcl_ReapDetachedProcs.3
+if test -r Preserve.3; then
+    rm -f Tcl_Preserve.3
+    ln Preserve.3 Tcl_Preserve.3
 fi
-if test -r $1/RecordEval.3; then
-    rm -f $1/Tcl_RecordAndEval.3
-    ln $1/RecordEval.3 $1/Tcl_RecordAndEval.3
+if test -r PrintDbl.3; then
+    rm -f Tcl_PrintDouble.3
+    ln PrintDbl.3 Tcl_PrintDouble.3
 fi
-if test -r $1/RegExp.3; then
-    rm -f $1/Tcl_RegExpCompile.3
-    ln $1/RegExp.3 $1/Tcl_RegExpCompile.3
+if test -r Notifier.3; then
+    rm -f Tcl_QueueEvent.3
+    ln Notifier.3 Tcl_QueueEvent.3
 fi
-if test -r $1/RegExp.3; then
-    rm -f $1/Tcl_RegExpExec.3
-    ln $1/RegExp.3 $1/Tcl_RegExpExec.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Read.3
+    ln OpenFileChnl.3 Tcl_Read.3
 fi
-if test -r $1/RegExp.3; then
-    rm -f $1/Tcl_RegExpMatch.3
-    ln $1/RegExp.3 $1/Tcl_RegExpMatch.3
+if test -r Alloc.3; then
+    rm -f Tcl_Realloc.3
+    ln Alloc.3 Tcl_Realloc.3
 fi
-if test -r $1/RegExp.3; then
-    rm -f $1/Tcl_RegExpRange.3
-    ln $1/RegExp.3 $1/Tcl_RegExpRange.3
+if test -r DetachPids.3; then
+    rm -f Tcl_ReapDetachedProcs.3
+    ln DetachPids.3 Tcl_ReapDetachedProcs.3
 fi
-if test -r $1/Preserve.3; then
-    rm -f $1/Tcl_Release.3
-    ln $1/Preserve.3 $1/Tcl_Release.3
+if test -r RecordEval.3; then
+    rm -f Tcl_RecordAndEval.3
+    ln RecordEval.3 Tcl_RecordAndEval.3
 fi
-if test -r $1/SetResult.3; then
-    rm -f $1/Tcl_ResetResult.3
-    ln $1/SetResult.3 $1/Tcl_ResetResult.3
+if test -r RegExp.3; then
+    rm -f Tcl_RegExpCompile.3
+    ln RegExp.3 Tcl_RegExpCompile.3
 fi
-if test -r $1/SplitList.3; then
-    rm -f $1/Tcl_ScanElement.3
-    ln $1/SplitList.3 $1/Tcl_ScanElement.3
+if test -r RegExp.3; then
+    rm -f Tcl_RegExpExec.3
+    ln RegExp.3 Tcl_RegExpExec.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Seek.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Seek.3
+if test -r RegExp.3; then
+    rm -f Tcl_RegExpMatch.3
+    ln RegExp.3 Tcl_RegExpMatch.3
 fi
-if test -r $1/AssocData.3; then
-    rm -f $1/Tcl_SetAssocData.3
-    ln $1/AssocData.3 $1/Tcl_SetAssocData.3
+if test -r RegExp.3; then
+    rm -f Tcl_RegExpRange.3
+    ln RegExp.3 Tcl_RegExpRange.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_SetChannelBufferSize.3
-    ln $1/CrtChannel.3 $1/Tcl_SetChannelBufferSize.3
+if test -r Preserve.3; then
+    rm -f Tcl_Release.3
+    ln Preserve.3 Tcl_Release.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_SetChannelOption.3
-    ln $1/OpenFileChnl.3 $1/Tcl_SetChannelOption.3
+if test -r SetResult.3; then
+    rm -f Tcl_ResetResult.3
+    ln SetResult.3 Tcl_ResetResult.3
 fi
-if test -r $1/CrtCommand.3; then
-    rm -f $1/Tcl_SetCommandInfo.3
-    ln $1/CrtCommand.3 $1/Tcl_SetCommandInfo.3
+if test -r SplitList.3; then
+    rm -f Tcl_ScanElement.3
+    ln SplitList.3 Tcl_ScanElement.3
 fi
-if test -r $1/CrtChannel.3; then
-    rm -f $1/Tcl_SetDefaultTranslation.3
-    ln $1/CrtChannel.3 $1/Tcl_SetDefaultTranslation.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Seek.3
+    ln OpenFileChnl.3 Tcl_Seek.3
 fi
-if test -r $1/SetErrno.3; then
-    rm -f $1/Tcl_SetErrno.3
-    ln $1/SetErrno.3 $1/Tcl_SetErrno.3
+if test -r AssocData.3; then
+    rm -f Tcl_SetAssocData.3
+    ln AssocData.3 Tcl_SetAssocData.3
 fi
-if test -r $1/AddErrInfo.3; then
-    rm -f $1/Tcl_SetErrorCode.3
-    ln $1/AddErrInfo.3 $1/Tcl_SetErrorCode.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_SetChannelBufferSize.3
+    ln CrtChannel.3 Tcl_SetChannelBufferSize.3
 fi
-if test -r $1/Hash.3; then
-    rm -f $1/Tcl_SetHashValue.3
-    ln $1/Hash.3 $1/Tcl_SetHashValue.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_SetChannelOption.3
+    ln OpenFileChnl.3 Tcl_SetChannelOption.3
 fi
-if test -r $1/Notifier.3; then
-    rm -f $1/Tcl_SetMaxBlockTime.3
-    ln $1/Notifier.3 $1/Tcl_SetMaxBlockTime.3
+if test -r CrtCommand.3; then
+    rm -f Tcl_SetCommandInfo.3
+    ln CrtCommand.3 Tcl_SetCommandInfo.3
 fi
-if test -r $1/SetRecLmt.3; then
-    rm -f $1/Tcl_SetRecursionLimit.3
-    ln $1/SetRecLmt.3 $1/Tcl_SetRecursionLimit.3
+if test -r CrtChannel.3; then
+    rm -f Tcl_SetDefaultTranslation.3
+    ln CrtChannel.3 Tcl_SetDefaultTranslation.3
 fi
-if test -r $1/SetResult.3; then
-    rm -f $1/Tcl_SetResult.3
-    ln $1/SetResult.3 $1/Tcl_SetResult.3
+if test -r SetErrno.3; then
+    rm -f Tcl_SetErrno.3
+    ln SetErrno.3 Tcl_SetErrno.3
 fi
-if test -r $1/GetStdChan.3; then
-    rm -f $1/Tcl_SetStdChannel.3
-    ln $1/GetStdChan.3 $1/Tcl_SetStdChannel.3
+if test -r AddErrInfo.3; then
+    rm -f Tcl_SetErrorCode.3
+    ln AddErrInfo.3 Tcl_SetErrorCode.3
 fi
-if test -r $1/SetVar.3; then
-    rm -f $1/Tcl_SetVar.3
-    ln $1/SetVar.3 $1/Tcl_SetVar.3
+if test -r Hash.3; then
+    rm -f Tcl_SetHashValue.3
+    ln Hash.3 Tcl_SetHashValue.3
 fi
-if test -r $1/SetVar.3; then
-    rm -f $1/Tcl_SetVar2.3
-    ln $1/SetVar.3 $1/Tcl_SetVar2.3
+if test -r Notifier.3; then
+    rm -f Tcl_SetMaxBlockTime.3
+    ln Notifier.3 Tcl_SetMaxBlockTime.3
 fi
-if test -r $1/Sleep.3; then
-    rm -f $1/Tcl_Sleep.3
-    ln $1/Sleep.3 $1/Tcl_Sleep.3
+if test -r SetRecLmt.3; then
+    rm -f Tcl_SetRecursionLimit.3
+    ln SetRecLmt.3 Tcl_SetRecursionLimit.3
 fi
-if test -r $1/SplitList.3; then
-    rm -f $1/Tcl_SplitList.3
-    ln $1/SplitList.3 $1/Tcl_SplitList.3
+if test -r SetResult.3; then
+    rm -f Tcl_SetResult.3
+    ln SetResult.3 Tcl_SetResult.3
 fi
-if test -r $1/StaticPkg.3; then
-    rm -f $1/Tcl_StaticPackage.3
-    ln $1/StaticPkg.3 $1/Tcl_StaticPackage.3
+if test -r GetStdChan.3; then
+    rm -f Tcl_SetStdChannel.3
+    ln GetStdChan.3 Tcl_SetStdChannel.3
 fi
-if test -r $1/StrMatch.3; then
-    rm -f $1/Tcl_StringMatch.3
-    ln $1/StrMatch.3 $1/Tcl_StringMatch.3
+if test -r SetVar.3; then
+    rm -f Tcl_SetVar.3
+    ln SetVar.3 Tcl_SetVar.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Tell.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Tell.3
+if test -r SetVar.3; then
+    rm -f Tcl_SetVar2.3
+    ln SetVar.3 Tcl_SetVar2.3
 fi
-if test -r $1/TraceVar.3; then
-    rm -f $1/Tcl_TraceVar.3
-    ln $1/TraceVar.3 $1/Tcl_TraceVar.3
+if test -r Sleep.3; then
+    rm -f Tcl_Sleep.3
+    ln Sleep.3 Tcl_Sleep.3
 fi
-if test -r $1/TraceVar.3; then
-    rm -f $1/Tcl_TraceVar2.3
-    ln $1/TraceVar.3 $1/Tcl_TraceVar2.3
+if test -r SplitList.3; then
+    rm -f Tcl_SplitList.3
+    ln SplitList.3 Tcl_SplitList.3
 fi
-if test -r $1/Translate.3; then
-    rm -f $1/Tcl_TranslateFileName.3
-    ln $1/Translate.3 $1/Tcl_TranslateFileName.3
+if test -r SplitPath.3; then
+    rm -f Tcl_SplitPath.3
+    ln SplitPath.3 Tcl_SplitPath.3
 fi
-if test -r $1/LinkVar.3; then
-    rm -f $1/Tcl_UnlinkVar.3
-    ln $1/LinkVar.3 $1/Tcl_UnlinkVar.3
+if test -r StaticPkg.3; then
+    rm -f Tcl_StaticPackage.3
+    ln StaticPkg.3 Tcl_StaticPackage.3
 fi
-if test -r $1/SetVar.3; then
-    rm -f $1/Tcl_UnsetVar.3
-    ln $1/SetVar.3 $1/Tcl_UnsetVar.3
+if test -r StrMatch.3; then
+    rm -f Tcl_StringMatch.3
+    ln StrMatch.3 Tcl_StringMatch.3
 fi
-if test -r $1/SetVar.3; then
-    rm -f $1/Tcl_UnsetVar2.3
-    ln $1/SetVar.3 $1/Tcl_UnsetVar2.3
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Tell.3
+    ln OpenFileChnl.3 Tcl_Tell.3
 fi
-if test -r $1/TraceVar.3; then
-    rm -f $1/Tcl_UntraceVar.3
-    ln $1/TraceVar.3 $1/Tcl_UntraceVar.3
+if test -r TraceVar.3; then
+    rm -f Tcl_TraceVar.3
+    ln TraceVar.3 Tcl_TraceVar.3
 fi
-if test -r $1/TraceVar.3; then
-    rm -f $1/Tcl_UntraceVar2.3
-    ln $1/TraceVar.3 $1/Tcl_UntraceVar2.3
+if test -r TraceVar.3; then
+    rm -f Tcl_TraceVar2.3
+    ln TraceVar.3 Tcl_TraceVar2.3
 fi
-if test -r $1/UpVar.3; then
-    rm -f $1/Tcl_UpVar.3
-    ln $1/UpVar.3 $1/Tcl_UpVar.3
+if test -r Translate.3; then
+    rm -f Tcl_TranslateFileName.3
+    ln Translate.3 Tcl_TranslateFileName.3
 fi
-if test -r $1/UpVar.3; then
-    rm -f $1/Tcl_UpVar2.3
-    ln $1/UpVar.3 $1/Tcl_UpVar2.3
+if test -r LinkVar.3; then
+    rm -f Tcl_UnlinkVar.3
+    ln LinkVar.3 Tcl_UnlinkVar.3
 fi
-if test -r $1/LinkVar.3; then
-    rm -f $1/Tcl_UpdateLinkedVar.3
-    ln $1/LinkVar.3 $1/Tcl_UpdateLinkedVar.3
+if test -r SetVar.3; then
+    rm -f Tcl_UnsetVar.3
+    ln SetVar.3 Tcl_UnsetVar.3
 fi
-if test -r $1/Eval.3; then
-    rm -f $1/Tcl_VarEval.3
-    ln $1/Eval.3 $1/Tcl_VarEval.3
+if test -r SetVar.3; then
+    rm -f Tcl_UnsetVar2.3
+    ln SetVar.3 Tcl_UnsetVar2.3
 fi
-if test -r $1/TraceVar.3; then
-    rm -f $1/Tcl_VarTraceInfo.3
-    ln $1/TraceVar.3 $1/Tcl_VarTraceInfo.3
+if test -r TraceVar.3; then
+    rm -f Tcl_UntraceVar.3
+    ln TraceVar.3 Tcl_UntraceVar.3
 fi
-if test -r $1/TraceVar.3; then
-    rm -f $1/Tcl_VarTraceInfo2.3
-    ln $1/TraceVar.3 $1/Tcl_VarTraceInfo2.3
+if test -r TraceVar.3; then
+    rm -f Tcl_UntraceVar2.3
+    ln TraceVar.3 Tcl_UntraceVar2.3
 fi
-if test -r $1/Notifier.3; then
-    rm -f $1/Tcl_WaitForEvent.3
-    ln $1/Notifier.3 $1/Tcl_WaitForEvent.3
+if test -r UpVar.3; then
+    rm -f Tcl_UpVar.3
+    ln UpVar.3 Tcl_UpVar.3
 fi
-if test -r $1/Notifier.3; then
-    rm -f $1/Tcl_WatchFile.3
-    ln $1/Notifier.3 $1/Tcl_WatchFile.3
+if test -r UpVar.3; then
+    rm -f Tcl_UpVar2.3
+    ln UpVar.3 Tcl_UpVar2.3
 fi
-if test -r $1/OpenFileChnl.3; then
-    rm -f $1/Tcl_Write.3
-    ln $1/OpenFileChnl.3 $1/Tcl_Write.3
+if test -r LinkVar.3; then
+    rm -f Tcl_UpdateLinkedVar.3
+    ln LinkVar.3 Tcl_UpdateLinkedVar.3
 fi
-if test -r $1/pkgMkIndex.n; then
-    rm -f $1/pkg_mkIndex.n
-    ln $1/pkgMkIndex.n $1/pkg_mkIndex.n
+if test -r Eval.3; then
+    rm -f Tcl_VarEval.3
+    ln Eval.3 Tcl_VarEval.3
+fi
+if test -r TraceVar.3; then
+    rm -f Tcl_VarTraceInfo.3
+    ln TraceVar.3 Tcl_VarTraceInfo.3
+fi
+if test -r TraceVar.3; then
+    rm -f Tcl_VarTraceInfo2.3
+    ln TraceVar.3 Tcl_VarTraceInfo2.3
+fi
+if test -r Notifier.3; then
+    rm -f Tcl_WaitForEvent.3
+    ln Notifier.3 Tcl_WaitForEvent.3
+fi
+if test -r Notifier.3; then
+    rm -f Tcl_WatchFile.3
+    ln Notifier.3 Tcl_WatchFile.3
+fi
+if test -r OpenFileChnl.3; then
+    rm -f Tcl_Write.3
+    ln OpenFileChnl.3 Tcl_Write.3
+fi
+if test -r pkgMkIndex.n; then
+    rm -f pkg_mkIndex.n
+    ln pkgMkIndex.n pkg_mkIndex.n
 fi
 exit 0
diff --git a/contrib/tcl/unix/porting.notes b/contrib/tcl/unix/porting.notes
index 6555a20..e018b9d 100644
--- a/contrib/tcl/unix/porting.notes
+++ b/contrib/tcl/unix/porting.notes
@@ -26,7 +26,7 @@ and Tk to compile.  You can also add new entries to that database
 when you install Tcl and Tk on a new platform.  The Web database is
 likely to be more up-to-date than this file.
 
-sccsid = SCCS: @(#) porting.notes 1.16 96/04/17 10:32:35
+sccsid = SCCS: @(#) porting.notes 1.17 96/05/18 16:49:24
 
 --------------------------------------------
 Solaris, various versions
@@ -355,3 +355,38 @@ Expect failures from socket tests 2.9 and 3.1.
 
 Contact me directly if you have problems on SCO systems.
 Mark Diekhans <markd@sco.com>
+ 
+--------------------------------------------
+Linux 1.2.13 (gcc 2.7.0, libc.so.5.0.9)
+--------------------------------------------
+
+Symptoms:
+
+*	Some extensions could not be loaded dynamically, most
+	prominently Blt 2.0
+
+	The given error message essentially said:
+	Could not resolve symbol '__eprintf'.
+
+	(This procedure is used by the macro 'assert')
+
+Cause
+
+*	'__eprintf' is defined in 'libgcc.a', not 'libc.so.x.y'.
+	It is therefore impossible to load it dynamically.
+
+*	Neither tcl nor tk make use of 'assert', thereby
+	preventing a static linkage.
+
+Workaround
+
+*	I included <assert.h> in 'tclAppInit.c' / 'tkAppInit.c'
+	and then executed 'assert (argc)' just before the call
+	to Tcl_Main / Tk_Main.
+
+	This forced the static linkage of '__eprintf' and
+	everything went fine from then on.
+
+	(Something like 'assert (1)', 'assert (a==a)' is not
+	sufficient, it will be optimized away).
+
diff --git a/contrib/tcl/unix/tclUnixChan.c b/contrib/tcl/unix/tclUnixChan.c
index aa16fe3..a48806f 100644
--- a/contrib/tcl/unix/tclUnixChan.c
+++ b/contrib/tcl/unix/tclUnixChan.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tclUnixChan.c 1.161 96/04/18 08:28:54
+ * SCCS: @(#) tclUnixChan.c 1.172 96/06/11 10:14:51
  */
 
 #include	"tclInt.h"	/* Internal definitions for Tcl. */
@@ -26,6 +26,9 @@ typedef struct PipeState {
     int numPids;	/* How many processes are attached to this pipe? */
     int *pidPtr;	/* The process IDs themselves. Allocated by
                          * the creator of the pipe. */
+    int isNonBlocking;	/* Nonzero when the pipe is in nonblocking mode.
+                         * Used to decide whether to wait for the children
+                         * at close time. */
 } PipeState;
 
 /*
@@ -49,6 +52,15 @@ typedef struct TcpState {
 #define TCP_ASYNC_CONNECT	(1<<1)	/* Async connect in progress. */
 
 /*
+ * The following defines the maximum length of the listen queue. This is
+ * the number of outstanding yet-to-be-serviced requests for a connection
+ * on a server socket, more than this number of outstanding requests and
+ * the connection request will fail.
+ */
+
+#define TCL_LISTEN_LIMIT	100
+
+/*
  * The following defines how much buffer space the kernel should maintain
  * for a socket.
  */
@@ -59,15 +71,15 @@ typedef struct TcpState {
  * Static routines for this file:
  */
 
-static int		CommonBlockModeProc _ANSI_ARGS_((
-    			    ClientData instanceData, Tcl_File inFile,
-                            Tcl_File outFile, int mode));
 static TcpState *	CreateSocket _ANSI_ARGS_((Tcl_Interp *interp,
 			    int port, char *host, int server,
 			    char *myaddr, int myport, int async));
 static int		CreateSocketAddress _ANSI_ARGS_(
 			    (struct sockaddr_in *sockaddrPtr,
 			    char *host, int port));
+static int		FileBlockModeProc _ANSI_ARGS_((
+    			    ClientData instanceData, Tcl_File inFile,
+                            Tcl_File outFile, int mode));
 static int		FileCloseProc _ANSI_ARGS_((ClientData instanceData,
 			    Tcl_Interp *interp, Tcl_File inFile,
                             Tcl_File outFile));
@@ -80,6 +92,9 @@ static int		FilePipeOutputProc _ANSI_ARGS_((
 static int		FileSeekProc _ANSI_ARGS_((ClientData instanceData,
 			    Tcl_File inFile, Tcl_File outFile, long offset,
 			    int mode, int *errorCode));
+static int		PipeBlockModeProc _ANSI_ARGS_((
+    			    ClientData instanceData, Tcl_File inFile,
+                            Tcl_File outFile, int mode));
 static int		PipeCloseProc _ANSI_ARGS_((ClientData instanceData,
 			    Tcl_Interp *interp, Tcl_File inFile,
                             Tcl_File outFile));
@@ -106,7 +121,7 @@ static int		WaitForConnect _ANSI_ARGS_((TcpState *statePtr,
 
 static Tcl_ChannelType fileChannelType = {
     "file",				/* Type name. */
-    CommonBlockModeProc,		/* Set blocking/nonblocking mode.*/
+    FileBlockModeProc,			/* Set blocking/nonblocking mode.*/
     FileCloseProc,			/* Close proc. */
     FilePipeInputProc,			/* Input proc. */
     FilePipeOutputProc,			/* Output proc. */
@@ -122,7 +137,7 @@ static Tcl_ChannelType fileChannelType = {
 
 static Tcl_ChannelType pipeChannelType = {
     "pipe",				/* Type name. */
-    CommonBlockModeProc,		/* Set blocking/nonblocking mode.*/
+    PipeBlockModeProc,			/* Set blocking/nonblocking mode.*/
     PipeCloseProc,			/* Close proc. */
     FilePipeInputProc,			/* Input proc. */
     FilePipeOutputProc,			/* Output proc. */
@@ -150,7 +165,7 @@ static Tcl_ChannelType tcpChannelType = {
 /*
  *----------------------------------------------------------------------
  *
- * CommonBlockModeProc --
+ * FileBlockModeProc --
  *
  *	Helper procedure to set blocking and nonblocking modes on a
  *	channel. Invoked either by generic IO level code or by other
@@ -167,7 +182,7 @@ static Tcl_ChannelType tcpChannelType = {
 
 	/* ARGSUSED */
 static int
-CommonBlockModeProc(instanceData, inFile, outFile, mode)
+FileBlockModeProc(instanceData, inFile, outFile, mode)
     ClientData instanceData;		/* Unused. */
     Tcl_File inFile, outFile;		/* Input, output files for channel. */
     int mode;				/* The mode to set. Can be one of
@@ -209,6 +224,69 @@ CommonBlockModeProc(instanceData, inFile, outFile, mode)
 /*
  *----------------------------------------------------------------------
  *
+ * PipeBlockModeProc --
+ *
+ *	Helper procedure to set blocking and nonblocking modes on a
+ *	channel. Invoked either by generic IO level code or by other
+ *	channel drivers after doing channel-type-specific inialization.
+ *
+ * Results:
+ *	0 if successful, errno when failed.
+ *
+ * Side effects:
+ *	Sets the device into blocking or non-blocking mode.
+ *
+ *----------------------------------------------------------------------
+ */
+
+	/* ARGSUSED */
+static int
+PipeBlockModeProc(instanceData, inFile, outFile, mode)
+    ClientData instanceData;		/* The pipe state. */
+    Tcl_File inFile, outFile;		/* Input, output files for channel. */
+    int mode;				/* The mode to set. Can be one of
+                                         * TCL_MODE_BLOCKING or
+                                         * TCL_MODE_NONBLOCKING. */
+{
+    PipeState *pipePtr;
+    int curStatus;
+    int fd;
+
+    if (inFile != NULL) {
+        fd = (int) Tcl_GetFileInfo(inFile, NULL);
+        curStatus = fcntl(fd, F_GETFL);
+        if (mode == TCL_MODE_BLOCKING) {
+            curStatus &= (~(O_NONBLOCK));
+        } else {
+            curStatus |= O_NONBLOCK;
+        }
+        if (fcntl(fd, F_SETFL, curStatus) < 0) {
+            return errno;
+        }
+        curStatus = fcntl(fd, F_GETFL);
+    }
+    if (outFile != NULL) {
+        fd = (int) Tcl_GetFileInfo(outFile, NULL);
+        curStatus = fcntl(fd, F_GETFL);
+        if (mode == TCL_MODE_BLOCKING) {
+            curStatus &= (~(O_NONBLOCK));
+        } else {
+            curStatus |= O_NONBLOCK;
+        }
+        if (fcntl(fd, F_SETFL, curStatus) < 0) {
+            return errno;
+        }
+    }
+
+    pipePtr = (PipeState *) instanceData;
+    pipePtr->isNonBlocking = (mode == TCL_MODE_NONBLOCKING) ? 1 : 0;
+    
+    return 0;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * FilePipeInputProc --
  *
  *	This procedure is invoked from the generic IO level to read
@@ -336,17 +414,29 @@ FileCloseProc(instanceData, interp, inFile, outFile)
         fd = (int) Tcl_GetFileInfo(inFile, NULL);
         Tcl_FreeFile(inFile);
 
-	if (close(fd) < 0) {
-	    errorCode = errno;
-	}
+        if (tclInInterpreterDeletion) {
+            if ((fd != 0) && (fd != 1) && (fd != 2)) {
+                if (close(fd) < 0) {
+                    errorCode = errno;
+                }
+            }
+        } else if (close(fd) < 0) {
+            errorCode = errno;
+        }
     }
 
     if (outFile != NULL) {
         fd = (int) Tcl_GetFileInfo(outFile, NULL);
         Tcl_FreeFile(outFile);        
-	if ((close(fd) < 0) && (errorCode == 0)) {
-	    errorCode = errno;
-	}
+        if (tclInInterpreterDeletion) {
+            if ((fd != 0) && (fd != 1) && (fd != 2)) {
+                if ((close(fd) < 0) && (errorCode == 0)) {
+                    errorCode = errno;
+                }
+            }
+        } else if ((close(fd) < 0) && (errorCode == 0)) {
+            errorCode = errno;
+        }
     }
     return errorCode;
 }
@@ -484,6 +574,7 @@ PipeCloseProc(instanceData, interp, inFile, outFile)
     int fd, errorCode, result;
 
     errorCode = 0;
+    result = 0;
     pipePtr = (PipeState *) instanceData;
     if (pipePtr->readFile != NULL) {
         fd = (int) Tcl_GetFileInfo(pipePtr->readFile, NULL);
@@ -499,20 +590,34 @@ PipeCloseProc(instanceData, interp, inFile, outFile)
 	    errorCode = errno;
 	}
     }
-    
-    /*
-     * Wrap the error file into a channel and give it to the cleanup
-     * routine.
-     */
 
-    if (pipePtr->errorFile != NULL) {
-	errChan = Tcl_CreateChannel(&fileChannelType, "pipeError",
-                pipePtr->errorFile, NULL, NULL);
+    if (pipePtr->isNonBlocking) {
+    
+	/*
+         * If the channel is non-blocking, just detach the children PIDs
+         * and discard the errorFile.
+         */
+        
+        Tcl_DetachPids(pipePtr->numPids, pipePtr->pidPtr);
+        if (pipePtr->errorFile != NULL) {
+            Tcl_FreeFile(pipePtr->errorFile);
+        }
     } else {
-	errChan = NULL;
+        
+	/*
+         * Wrap the error file into a channel and give it to the cleanup
+         * routine.
+         */
+
+        if (pipePtr->errorFile != NULL) {
+            errChan = Tcl_CreateChannel(&fileChannelType, "pipeError",
+                    pipePtr->errorFile, NULL, NULL);
+        } else {
+            errChan = NULL;
+        }
+        result = TclCleanupChildren(interp, pipePtr->numPids, pipePtr->pidPtr,
+                errChan);
     }
-    result = TclCleanupChildren(interp, pipePtr->numPids, pipePtr->pidPtr,
-            errChan);
     if (pipePtr->numPids != 0) {
         ckfree((char *) pipePtr->pidPtr);
     }
@@ -664,6 +769,8 @@ Tcl_MakeFileChannel(inFd, outFd, mode)
                                  * TCL_WRITABLE to indicate whether inFile
                                  * and/or outFile are valid. */
 {
+    Tcl_Channel chan;
+    int fileUsed;
     Tcl_File inFile, outFile;
     char channelName[20];
 
@@ -684,6 +791,25 @@ Tcl_MakeFileChannel(inFd, outFd, mode)
         outFile = Tcl_GetFile(outFd, TCL_UNIX_FD);
     }
 
+    /*
+     * Look to see if a channel with those two Tcl_Files already exists.
+     * If so, return it.
+     */
+    
+    chan = TclFindFileChannel(inFile, outFile, &fileUsed);
+    if (chan != (Tcl_Channel) NULL) {
+        return chan;
+    }
+
+    /*
+     * If one of the Tcl_Files is used in another channel, do not
+     * create a new channel containing it; this avoids core dumps
+     * later, when the Tcl_File would be freed twice.
+     */
+    
+    if (fileUsed) {
+        return (Tcl_Channel) NULL;
+    }
     return Tcl_CreateChannel(&fileChannelType, channelName, inFile, outFile,
             (ClientData) NULL);
 }
@@ -728,6 +854,7 @@ TclCreateCommandChannel(readFile, writeFile, errorFile, numPids, pidPtr)
     statePtr->errorFile = errorFile;
     statePtr->numPids = numPids;
     statePtr->pidPtr = pidPtr;
+    statePtr->isNonBlocking = 0;
 
     /*
      * Use one of the fds associated with the channel as the
@@ -857,7 +984,7 @@ TcpBlockModeProc(instanceData, inFile, outFile, mode)
     } else {
         statePtr->flags |= TCP_ASYNC_SOCKET;
     }
-    return CommonBlockModeProc(instanceData, inFile, outFile, mode);
+    return FileBlockModeProc(instanceData, inFile, outFile, mode);
 }
 
 /*
@@ -1271,7 +1398,7 @@ CreateSocket(interp, port, host, server, myaddr, myport, async)
 	status = bind(sock, (struct sockaddr *) &sockaddr,
                 sizeof(struct sockaddr));
 	if (status != -1) {
-	    status = listen(sock, 5);
+	    status = listen(sock, TCL_LISTEN_LIMIT);
 	} 
     } else {
 	if (myaddr != NULL || myport != 0) { 
@@ -1380,7 +1507,7 @@ CreateSocketAddress(sockaddrPtr, host, port)
 	addr.s_addr = INADDR_ANY;
     } else {
         addr.s_addr = inet_addr(host);
-        if (addr.s_addr == (unsigned long) -1) {
+        if (addr.s_addr == -1) {
             hostent = gethostbyname(host);
             if (hostent != NULL) {
                 memcpy((VOID *) &addr,
@@ -1664,27 +1791,34 @@ TclGetDefaultStdChannel(type)
     int mode = 0;		/* compiler warning (used before set). */
     char *bufMode = NULL;
 
-    /*
-     * If the channels were not created yet, create them now and
-     * store them in the static variables.
-     */
-
     switch (type) {
-	case TCL_STDIN:
+        case TCL_STDIN:
+            if ((lseek(0, (off_t) 0, SEEK_CUR) == -1) &&
+                    (errno == EBADF)) {
+                return (Tcl_Channel) NULL;
+            }
 	    fd = 0;
 	    mode = TCL_READABLE;
             bufMode = "line";
-	    break;
-	case TCL_STDOUT:
+            break;
+        case TCL_STDOUT:
+            if ((lseek(1, (off_t) 0, SEEK_CUR) == -1) &&
+                    (errno == EBADF)) {
+                return (Tcl_Channel) NULL;
+            }
 	    fd = 1;
 	    mode = TCL_WRITABLE;
             bufMode = "line";
-	    break;
-	case TCL_STDERR:
+            break;
+        case TCL_STDERR:
+            if ((lseek(2, (off_t) 0, SEEK_CUR) == -1) &&
+                    (errno == EBADF)) {
+                return (Tcl_Channel) NULL;
+            }
 	    fd = 2;
 	    mode = TCL_WRITABLE;
 	    bufMode = "none";
-	    break;
+            break;
 	default:
 	    panic("TclGetDefaultStdChannel: Unexpected channel type");
 	    break;
diff --git a/contrib/tcl/unix/tclUnixInit.c b/contrib/tcl/unix/tclUnixInit.c
index 639ae6a..a7206b6 100644
--- a/contrib/tcl/unix/tclUnixInit.c
+++ b/contrib/tcl/unix/tclUnixInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tclUnixInit.c 1.10 96/03/12 09:05:59
+ * SCCS: @(#) tclUnixInit.c 1.14 96/07/10 15:45:24
  */
 
 #include "tclInt.h"
@@ -17,7 +17,13 @@
 #   include <sys/utsname.h>
 #endif
 #if defined(__FreeBSD__)
-#include <floatingpoint.h>
+#   include <floatingpoint.h>
+#endif
+#if defined(__bsdi__)
+#   include <sys/param.h>
+#   if _BSDI_VERSION > 199501
+#	include <dlfcn.h>
+#   endif
 #endif
 
 /*
@@ -34,7 +40,7 @@ static char defaultLibraryDir[200] = TCL_LIBRARY;
  * initialization.
  */
 
-static char *initScript =
+static char initScript[] =
 "proc init {} {\n\
     global tcl_library tcl_version tcl_patchLevel env\n\
     rename init {}\n\
@@ -43,14 +49,15 @@ static char *initScript =
 	lappend dirs $env(TCL_LIBRARY)\n\
     }\n\
     lappend dirs [info library]\n\
-    lappend dirs [file dirname [file dirname [info nameofexecutable]]]/lib/tcl$tcl_version\n\
+    set parentDir [file dirname [file dirname [info nameofexecutable]]]\n\
+    lappend dirs $parentDir/lib/tcl$tcl_version\n\
     if [string match {*[ab]*} $tcl_patchLevel] {\n\
 	set lib tcl$tcl_patchLevel\n\
     } else {\n\
 	set lib tcl$tcl_version\n\
     }\n\
-    lappend dirs [file dirname [file dirname [pwd]]]/$lib/library\n\
-    lappend dirs [file dirname [pwd]]/library\n\
+    lappend dirs [file dirname $parentDir]/$lib/library\n\
+    lappend dirs $parentDir/library\n\
     foreach i $dirs {\n\
 	set tcl_library $i\n\
 	if ![catch {uplevel #0 source $i/init.tcl}] {\n\
@@ -132,6 +139,13 @@ TclPlatformInit(interp)
 	fpsetround(FP_RN);
 	fpsetmask(0L);
 #endif
+
+#if defined(__bsdi__) && (_BSDI_VERSION > 199501)
+	/*
+	 * Find local symbols. Don't report an error if we fail.
+	 */
+	(void) dlopen (NULL, RTLD_NOW);
+#endif
 	initialized = 1;
     }
 }
diff --git a/contrib/tcl/unix/tclUnixNotfy.c b/contrib/tcl/unix/tclUnixNotfy.c
index e03d186..7dce634 100644
--- a/contrib/tcl/unix/tclUnixNotfy.c
+++ b/contrib/tcl/unix/tclUnixNotfy.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tclUnixNotfy.c 1.30 96/03/22 12:45:31
+ * SCCS: @(#) tclUnixNotfy.c 1.31 96/07/23 16:17:29
  */
 
 #include "tclInt.h"
@@ -289,7 +289,7 @@ Tcl_Sleep(ms)
      * early, go back to sleep again.
      */
 
-    TclGetTime(&before);
+    TclpGetTime(&before);
     after = before;
     after.sec += ms/1000;
     after.usec += (ms%1000)*1000;
@@ -316,7 +316,7 @@ Tcl_Sleep(ms)
 	}
 	(void) select(0, (SELECT_MASK *) 0, (SELECT_MASK *) 0,
 		(SELECT_MASK *) 0, &delay);
-	TclGetTime(&before);
+	TclpGetTime(&before);
     }
 }
 
diff --git a/contrib/tcl/unix/tclUnixPort.h b/contrib/tcl/unix/tclUnixPort.h
index 1b78021..bbf1432 100644
--- a/contrib/tcl/unix/tclUnixPort.h
+++ b/contrib/tcl/unix/tclUnixPort.h
@@ -19,7 +19,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * SCCS: @(#) tclUnixPort.h 1.33 96/03/25 17:15:21
+ * SCCS: @(#) tclUnixPort.h 1.34 96/07/23 16:17:47
  */
 
 #ifndef _TCLUNIXPORT
@@ -410,4 +410,12 @@ extern char **environ;
 
 extern double strtod();
 
+/*
+ * The following macros define time related functions in terms of
+ * standard Unix routines.
+ */
+
+#define TclpGetDate(t,u) ((u) ? gmtime((t)) : localtime((t)))
+#define TclStrftime(s,m,f,t) (strftime((s),(m),(f),(t)))
+
 #endif /* _TCLUNIXPORT */