--- tcl-trf-2.1/Makefile.in.orig	2004-05-15 17:55:12 +0300
+++ tcl-trf-2.1/Makefile.in	2004-05-15 17:56:06 +0300
@@ -183,8 +183,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE)$(VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -302,7 +302,7 @@
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 	if test "x$(SHARED_BUILD)" = "x1"; then \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkgdatadir); \
 	fi
 
 #========================================================================
@@ -415,7 +415,7 @@
 
 pkgIndex.tcl-hand:
 	(echo 'package ifneeded $(PACKAGE) $(VERSION) \
-	    [list load [file join $$dir $($(PACKAGE)_LIB_FILE)]]'\
+	    [list load [file join $$dir .. .. .. lib tcl $($(PACKAGE)_LIB_FILE)]]'\
 	) > pkgIndex.tcl
 
 #========================================================================
@@ -509,7 +509,7 @@
 #========================================================================
 
 install-lib-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"; \
@@ -528,8 +528,8 @@
 	done
 	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " Install $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
 	  fi; \
 	done