--- rrdtool-1.2.28/bindings/tcl/Makefile.am.p0	2008-07-24 00:56:09 +1100
+++ rrdtool-1.2.28/bindings/tcl/Makefile.am	2008-09-05 16:54:42 +1100
@@ -10,6 +10,7 @@ TCL_SHLIB_LD = @TCL_SHLIB_LD@
 TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
 TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
 TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+TCL_PACKAGE_LIB = @TCL_PACKAGE_LIB@
 TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
 TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
 TCL_INC_DIR = @TCL_INC_DIR@
@@ -49,9 +50,9 @@ tclrrd.o: tclrrd.c
 	$(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"
 
 pkgIndex.tcl:
-	echo "package ifneeded Rrd $(VERSION) \"load $(libdir)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@
+	echo "package ifneeded Rrd $(VERSION) \"load $(TCL_PACKAGE_LIB)/tclrrd$(VERSION)[info sharedlibextension]\"" > $@
 
 install-exec-local: $(TCL_RRD_LIB)
 	@$(NORMAL_INSTALL)
-	$(INSTALL_PROGRAM) $(TCL_RRD_LIB) $(DESTDIR)$(libdir)/$(TCL_RRD_LIB)
+	$(INSTALL_PROGRAM) $(TCL_RRD_LIB) $(DESTDIR)$(TCL_PACKAGE_LIB)/$(TCL_RRD_LIB)
 
--- rrdtool-1.2.28/configure.ac.p0	2008-07-24 00:56:10 +1100
+++ rrdtool-1.2.28/configure.ac	2008-09-05 16:54:42 +1100
@@ -699,9 +699,10 @@ if test  "$enable_tcl" = "yes"; then
   else
 	. $tcl_config
 	TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
+	TCL_PACKAGE_LIB="$libdir/tcl"
   fi
   AC_ARG_ENABLE(tcl,[  --enable-tcl-site        install the tcl extension in the tcl tree],
-  [],[enable_tcl_site=yes])
+  [enable_tcl_site="$enable_tcl"],[enable_tcl_site=yes])
 
 fi
 
@@ -712,7 +713,7 @@ AC_SUBST(TCL_PREFIX)
 AC_SUBST(TCL_SHLIB_CFLAGS)
 AC_SUBST(TCL_SHLIB_LD)
 AC_SUBST(TCL_SHLIB_SUFFIX)
-AC_SUBST(TCL_PACKAGE_PATH)
+AC_SUBST(TCL_PACKAGE_LIB)
 AC_SUBST(TCL_LD_SEARCH_FLAGS)
 AC_SUBST(TCL_STUB_LIB_SPEC)
 AC_SUBST(TCL_VERSION)