--- Makefile.in
+++ Makefile.in
@@ -23,7 +23,7 @@
 SETUID = @SETUID@
 # SETUID = chmod u+s
 
-LIB_RUNTIME_DIR = $(INSTALL_ROOT)@libdir@
+LIB_RUNTIME_DIR = $(DESTDIR)@libdir@
 
 # The following Expect scripts are not necessary to have installed as
 # commands, but are very useful. Edit out what you don't want
@@ -101,7 +101,7 @@
 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
 
 lib_BINARIES	= $(PKG_LIB_FILE)
-bin_BINARIES	= expect expectk
+bin_BINARIES	= expect
 BINARIES	= $(lib_BINARIES) $(bin_BINARIES)
 
 SHELL		= @SHELL@
@@ -120,7 +120,7 @@
 
 PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
 pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkglibdir	= $(datadir)/tcl/$(PKG_DIR)
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -236,10 +236,10 @@
 	    $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
 	done;
 # install standalone scripts and their man pages, if requested
-	@mkdir -p $(INSTALL_ROOT)$(prefix)/bin
+	@mkdir -p $(DESTDIR)$(prefix)/bin
 	-for i in $(SCRIPT_LIST) ; do \
 	  if [ -f $$i ] ; then \
-	    $(INSTALL_PROGRAM) $$i $(INSTALL_ROOT)$(prefix)/bin/$$i ; \
+	    $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
 	    rm -f $$i ; \
 	  else true; fi ; \
 	done
@@ -254,14 +254,14 @@
 	@mkdir -p $(DESTDIR)$(mandir)/man3
 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
 # install Expectk man page if present
-	$(INSTALL_DATA) $(srcdir)/expectk.man $(mandir)/man1/expectk.1 ; \
+	$(INSTALL_DATA) $(srcdir)/expectk.man $(DESTDIR)$(mandir)/man1/expectk.1 ; \
 # install Expect man page
-	$(INSTALL_DATA) $(srcdir)/expect.man $(mandir)/man1/expect.1
+	$(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1
 # install man page for Expect and Expectk libraries
-	$(INSTALL_DATA) $(srcdir)/libexpect.man $(mandir)/man3/libexpect.3
+	$(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3
 	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
 	  if [ -f $(srcdir)/example/$$i.man ] ; then \
-	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(mandir)/man1/$$i.1 ; \
+	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \
 	  else true; fi ; \
 	done
 
@@ -329,7 +329,7 @@
 
 pkgIndex.tcl-hand:
 	(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
-	    [list load [file join $$dir $(PKG_LIB_FILE)]]'\
+	    [list load $(PKG_LIB_FILE)]'\
 	) > pkgIndex.tcl
 
 #========================================================================
@@ -460,29 +460,30 @@
 #========================================================================
 
 install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(libdir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
 	    if test "x$$stub" = "xstub"; then \
-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
 	    else \
-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
 	    fi; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
 		if test -f $$lib; then \
-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
 		fi; \
 	    fi; \
 	  fi; \
 	done
+	@mkdir -p $(DESTDIR)$(pkglibdir)
 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    destp=`basename $$p`; \
@@ -521,7 +522,7 @@
 
 uninstall-binaries:
 	list='$(lib_BINARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+	  rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 	list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
 	  p=`basename $$p`; \
--- configure.in
+++ configure.in
@@ -49,8 +49,8 @@
 TEA_PATH_TCLCONFIG
 TEA_LOAD_TCLCONFIG
 
-TEA_PATH_TKCONFIG
-TEA_LOAD_TKCONFIG
+# TEA_PATH_TKCONFIG
+# TEA_LOAD_TKCONFIG
 
 #-----------------------------------------------------------------------
 # Handle the --prefix=... option by defaulting to what Tcl gave.
@@ -79,7 +79,8 @@
 
 #TEA_PUBLIC_TCL_HEADERS
 TEA_PRIVATE_TCL_HEADERS
-TEA_PUBLIC_TK_HEADERS
+#TEA_PUBLIC_TK_HEADERS
+AC_SUBST(TK_INCLUDES)
 
 #--------------------------------------------------------------------
 # A few miscellaneous platform-specific items:
--- exp_main_tk.c
+++ exp_main_tk.c
@@ -36,6 +36,7 @@
 #undef USE_TCL_STUBS
 
 #include <ctype.h>
+#include <string.h>
 
 #include "tk.h"
 
--- expect_cf.h.in
+++ expect_cf.h.in
@@ -4,7 +4,7 @@
 #ifndef __EXPECT_CF_H__
 #define __EXPECT_CF_H__
 
-#undef NO_STDLIB_H		/* Tcl requires this name */
+#undef NO_STDLIB_H
 #undef NO_UNION_WAIT
 #undef HAVE_STDARG_H
 #undef HAVE_VARARGS_H
@@ -12,12 +12,12 @@
 #undef HAVE_SYSCONF_H
 #undef HAVE_SYS_FCNTL_H
 #undef HAVE_SYS_WAIT_H
-#undef HAVE_SYS_BSDTYPES_H	/* nice ISC special */
-#undef HAVE_SYS_SELECT_H	/* nice ISC special */
-#undef HAVE_SYS_TIME_H		/* nice ISC special */
-#undef HAVE_SYS_PTEM_H		/* SCO needs this for window size */
-#undef HAVE_STRREDIR_H		/* Solaris needs this for console redir */
-#undef HAVE_STRPTY_H		/* old-style Dynix ptys need this */
+#undef HAVE_SYS_BSDTYPES_H
+#undef HAVE_SYS_SELECT_H
+#undef HAVE_SYS_TIME_H
+#undef HAVE_SYS_PTEM_H
+#undef HAVE_STRREDIR_H
+#undef HAVE_STRPTY_H
 #undef HAVE_UNISTD_H
 #undef HAVE_SYSMACROS_H
 #undef HAVE_INTTYPES_H
@@ -26,8 +26,8 @@
 
 #undef pid_t
 #undef RETSIGTYPE
-#undef TIME_WITH_SYS_TIME	/* ok to include both time.h and sys/time.h */
-#undef SETPGRP_VOID		/* if setpgrp takes 0 args */
+#undef TIME_WITH_SYS_TIME
+#undef SETPGRP_VOID
 
 /*
  * This section is for compile macros needed by
@@ -42,7 +42,7 @@
 #undef SIMPLE_EVENT
 #undef HAVE_STRFTIME
 #undef HAVE_MEMMOVE
-#undef HAVE_TIMEZONE		/* timezone() a la Pyramid */
+#undef HAVE_TIMEZONE
 #undef HAVE_SIGLONGJMP
 #undef HAVE_STRCHR
 
--- pty_termios.c
+++ pty_termios.c
@@ -7,6 +7,8 @@
 
 */
 
+#define _XOPEN_SOURCE 1 /* for ptsname */
+
 #include <stdio.h>
 #include <signal.h>
 
--- tclconfig/tcl.m4
+++ tclconfig/tcl.m4
@@ -794,7 +794,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -2208,7 +2208,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
--- testsuite/configure.in
+++ testsuite/configure.in
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(exp_test.c)
 
-CY_AC_PATH_TCLCONFIG
-CY_AC_LOAD_TCLCONFIG
+TEA_PATH_TCLCONFIG
+TEA_LOAD_TCLCONFIG
 CC=$TCL_CC
 
 AC_PROG_CC
-CY_AC_C_WORKS
+#CY_AC_C_WORKS
  
 # This is for LynxOS, which needs a flag to force true POSIX when
 # building. It's weirder than that, cause the flag varies depending
@@ -15,8 +15,8 @@
 # -mposix is for the new gcc (at least 2.5.8)
 # This modifies the value of $CC to have the POSIX flag added
 # so it'll configure correctly
-CY_AC_TCL_LYNX_POSIX
-CY_AC_PATH_TCLH
+#CY_AC_TCL_LYNX_POSIX
+#CY_AC_PATH_TCLH
 
 AC_SUBST(CC)
 AC_SUBST(TCLHDIR)