From c17c099634b3628c8eb2783862d9f427c0aa4b5c Mon Sep 17 00:00:00 2001 From: mo Date: Fri, 7 Jul 2000 11:13:06 +0000 Subject: Fix definition of TCL_SRC_DIR in mingw/vc++ configure so that it matches the unix verison --- ChangeLog | 6 ++++++ win/configure.in | 4 ++-- win/tclConfig.sh.in | 9 +-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8508a49..555ee61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-07-07 Mo DeJong + + * win/configure.in: Fix definition of + TCL_SRC_DIR so that it matches the Unix version. + * win/tclConfig.sh.in: Removed duplicate variables. + 2000-07-06 Eric Melski * tests/msgcat.test: diff --git a/win/configure.in b/win/configure.in index 875f2f0..ea43b56 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tcl installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.23 2000/06/13 21:01:06 ericm Exp $ +# RCS: @(#) $Id: configure.in,v 1.24 2000/07/07 11:13:07 mo Exp $ AC_INIT(../generic/tcl.h) @@ -93,7 +93,7 @@ TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" -eval "TCL_SRC_DIR=`cd $srcdir; pwd`" +eval "TCL_SRC_DIR=`cd $srcdir/..; pwd`" eval "TCL_STUB_LIB_FILE=${LIBPREFIX}tclstub$VER${LIBSUFFIX}" eval "TCL_DLL_FILE=tcl$VER${DLLSUFFIX}" eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}" diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in index 05c56b5..9bbf778 100644 --- a/win/tclConfig.sh.in +++ b/win/tclConfig.sh.in @@ -9,16 +9,9 @@ # # The information in this file is specific to a single platform. # -# RCS: @(#) $Id: tclConfig.sh.in,v 1.4 2000/06/20 21:30:34 ericm Exp $ +# RCS: @(#) $Id: tclConfig.sh.in,v 1.5 2000/07/07 11:13:07 mo Exp $ - -TCL_SRC_DIR="@TCL_SRC_DIR@" -TCL_LIB_FILE="@TCL_LIB_FILE@" TCL_DLL_FILE="@TCL_DLL_FILE@" -TCL_STUB_LIB_FILE="@TCL_STUB_LIB_FILE@" - - - # Tcl's version number. TCL_VERSION='@TCL_VERSION@' -- cgit v0.12