diff -Naur tcl8.4.16/unix/configure tcl8.4.16-magellan/unix/configure --- tcl8.4.16/unix/configure 2007-09-21 19:07:02.000000000 +0200 +++ tcl8.4.16-magellan/unix/configure 2007-11-06 00:59:03.000000000 +0100 @@ -9150,7 +9150,7 @@ DBGX='${TCL_DBGX}' eval "TCL_LIB_FILE=${TCL_LIB_FILE}" -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' +TCL_LIBRARY='$(libdir)/tcl$(VERSION)' PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' @@ -9280,7 +9280,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks" -elif test "$prefix" != "$exec_prefix"; then +elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" else TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" diff -Naur tcl8.4.16/unix/configure.in tcl8.4.16-magellan/unix/configure.in --- tcl8.4.16/unix/configure.in 2007-09-21 19:07:02.000000000 +0200 +++ tcl8.4.16-magellan/unix/configure.in 2007-11-06 00:59:45.000000000 +0100 @@ -570,7 +570,7 @@ DBGX='${TCL_DBGX}' eval "TCL_LIB_FILE=${TCL_LIB_FILE}" -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' +TCL_LIBRARY='$(libdir)/tcl$(VERSION)' PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' @@ -669,7 +669,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks" -elif test "$prefix" != "$exec_prefix"; then +elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" else TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"