From d6cc0803308fcf0d43bb076c1fc9bd6df1f322d3 Mon Sep 17 00:00:00 2001 From: dkf Date: Fri, 19 Feb 2010 15:02:53 +0000 Subject: Fix [Bug 2415437] with supplied patch. LIB_RUNTIME_DIR now not forced to be the same as $libdir. --- ChangeLog | 4 ++++ unix/Makefile.in | 4 ++-- unix/configure.in | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 813bb95..34e52cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-02-19 Donal K. Fellows + * unix/configure.in, unix/Makefile.in: [Bug 2415437]: Corrections to + allow installation of Tcl and Tk to different directories, especially + when neither is a system standard location. Also [Tcl Bug 2307398]. + * unix/installManPage: [Tcl Bug 2954638]: Correct behaviour of manual page installer. Also added armouring to check that assumptions about the initial state are actually valid (e.g., look for existing input diff --git a/unix/Makefile.in b/unix/Makefile.in index bc9fbf0..9d4d795 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.165 2009/12/23 07:16:52 nijtmans Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.166 2010/02/19 15:02:54 dkf Exp $ # Current Tk version; used in various names. @@ -52,7 +52,7 @@ INSTALL_ROOT = $(DESTDIR) 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) diff --git a/unix/configure.in b/unix/configure.in index 2d41391..d644ac1 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.168 2009/08/24 00:57:20 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.169 2010/02/19 15:02:54 dkf Exp $ AC_INIT([tk],[8.6]) AC_PREREQ(2.59) @@ -149,7 +149,7 @@ AC_C_BIGENDIAN # 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" @@ -817,6 +817,7 @@ AC_SUBST(LOCALES) 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) -- cgit v0.12