--- pkgIndex.in.orig	2007-02-10 21:07:34.000000000 -0800
+++ pkgIndex.in	2007-02-10 21:07:43.000000000 -0800
@@ -7,4 +7,4 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. .. @EXP_SHARED_LIB_FILE@]]
--- configure.in.orig	2007-02-10 21:30:13.000000000 -0800
+++ configure.in	2007-02-10 21:30:23.000000000 -0800
@@ -1260,6 +1260,7 @@
 AC_SUBST(UNSHARED_RANLIB)
 AC_SUBST(DEFAULT_STTY_ARGS)
 AC_SUBST(STTY_BIN)
+AC_SUBST(TCL_VERSION)
 AC_OUTPUT([Makefile \
 	pkgIndex],
 	chmod +x ${srcdir}/install-sh ${srcdir}/mkinstalldirs)
--- Makefile.in.orig	2007-02-10 21:34:28.000000000 -0800
+++ Makefile.in	2007-02-10 22:23:14.000000000 -0800
@@ -173,8 +173,8 @@
 bindir            = $(INSTALL_ROOT)@bindir@
 bindir_arch_indep = $(INSTALL_ROOT)$(prefix)/bin
 tcl_libdir        = $(INSTALL_ROOT)@libdir@
-libdir            = $(INSTALL_ROOT)@libdir@/expect$(VERSION)
-libdir_arch_indep = $(INSTALL_ROOT)$(prefix)/lib/expect$(VERSION)
+libdir            = $(INSTALL_ROOT)@libdir@/tcl@TCL_VERSION@/expect$(VERSION)
+libdir_arch_indep = $(INSTALL_ROOT)@datadir@/tcl@TCL_VERSION@/expect$(VERSION)
 
 mandir 	= $(INSTALL_ROOT)@mandir@
 man1dir = $(mandir)/man1