--- pkgIndex.tcl.in.orig	2006-01-06 03:09:00 +0300
+++ pkgIndex.tcl.in	2007-01-08 19:50:28 +0300
@@ -2,4 +2,4 @@
 # Tcl package index file
 #
 package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \
-    [list load [file join $dir @PKG_LIB_FILE@]]
+    [list load [file join $dir .. .. .. lib tcl @PKG_LIB_FILE@]]
--- Makefile.in.orig	2007-01-08 19:20:00 +0300
+++ Makefile.in	2007-01-08 19:41:23 +0300
@@ -87,8 +87,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -393,7 +393,7 @@
 #========================================================================
 
 install-lib-binaries: binaries
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+	@mkdir -p $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkgdatadir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
@@ -419,13 +419,13 @@
 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    destp=`basename $$p`; \
-	    echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
+	    echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \
 	  fi; \
 	done
 	@if test "x$(SHARED_BUILD)" = "x1"; then \
-	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkgdatadir)"; \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================