--- incrtcl-20071231cvs/configure.in.orig	2007-05-24 15:15:40.000000000 -0700
+++ incrtcl-20071231cvs/configure.in	2008-01-11 09:29:59.000000000 -0800
@@ -221,7 +221,7 @@
     eval itcl_STUB_LIB_FLAG="-litclstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
 fi
 itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
-itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
+itcl_LIB_SPEC="-L${libdir} ${itcl_LIB_FLAG}"
 
 itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
 itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
--- incrtcl-20071231cvs/configure.orig	2008-01-10 19:42:49.000000000 -0800
+++ incrtcl-20071231cvs/configure	2008-01-11 09:29:59.000000000 -0800
@@ -9495,7 +9495,7 @@
     eval itcl_STUB_LIB_FLAG="-litclstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
 fi
 itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
-itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
+itcl_LIB_SPEC="-L${libdir} ${itcl_LIB_FLAG}"
 
 itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
 itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
--- incrtcl-20071231cvs/Makefile.in.orig	2007-07-03 16:45:44.000000000 -0700
+++ incrtcl-20071231cvs/Makefile.in	2008-01-11 09:45:52.000000000 -0800
@@ -76,8 +76,8 @@
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
-pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgdatadir	= $(datadir)/tcl@TCL_VERSION@/$(PKG_DIR)
+pkglibdir	= $(libdir)/tcl@TCL_VERSION@/$(PKG_DIR)
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
@@ -342,15 +342,17 @@
 	@mkdir -p $(DESTDIR)$(pkglibdir)
 	@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; \
 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
 	    if test "x$$stub" = "xstub"; then \
+		echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+		$(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
 		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
 		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
 	    else \
-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+		echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+		$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
 	    fi; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
--- incrtcl-20071231cvs/pkgIndex.tcl.in.orig	2004-08-10 13:58:44.000000000 -0700
+++ incrtcl-20071231cvs/pkgIndex.tcl.in	2008-01-11 09:29:59.000000000 -0800
@@ -1,3 +1,4 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itcl]
+namespace eval ::itcl "variable library $dir"
+package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir .. .. "@PKG_LIB_FILE@"] Itcl]