Tcl Source Code

Artifact [0c0794d66f]
Login

Artifact 0c0794d66faeafd88440c9f9cfffa056ff31c0f1:

Attachment "tk-libdir.patch" to ticket [2307398fff] added by andygoth 2008-11-18 06:15:14.
diff -ur tk8.6a3/unix/configure.in tk8.6a3.new/unix/configure.in
--- tk8.6a3/unix/configure.in	2008-10-10 16:38:29.000000000 -0500
+++ tk8.6a3.new/unix/configure.in	2008-11-17 11:09:19.000000000 -0600
@@ -148,7 +148,7 @@
 # search path to reflect this.
 #------------------------------------------------------------------------
 
-LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
+LIB_RUNTIME_DIR='$(libdir)'
 
 if test "$TCL_EXEC_PREFIX" != "$exec_prefix"; then
     LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${TCL_EXEC_PREFIX}/lib"
@@ -727,6 +727,7 @@
 AC_SUBST(TK_WINDOWINGSYSTEM)
 AC_SUBST(TK_PKG_DIR)
 AC_SUBST(TK_LIBRARY)
+AC_SUBST(LIB_RUNTIME_DIR)
 AC_SUBST(PRIVATE_INCLUDE_DIR)
 AC_SUBST(HTML_DIR)
 
diff -ur tk8.6a3/unix/Makefile.in tk8.6a3.new/unix/Makefile.in
--- tk8.6a3/unix/Makefile.in	2008-10-10 16:38:29.000000000 -0500
+++ tk8.6a3.new/unix/Makefile.in	2008-11-17 11:00:53.000000000 -0600
@@ -52,7 +52,7 @@
 TK_LIBRARY		= @TK_LIBRARY@
 
 # Path to use at runtime to refer to LIB_INSTALL_DIR:
-LIB_RUNTIME_DIR		= $(libdir)
+LIB_RUNTIME_DIR		= @LIB_RUNTIME_DIR@
 
 # Directory in which to install the program wish:
 BIN_INSTALL_DIR		= $(INSTALL_ROOT)$(bindir)