summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormo <mo>2000-07-18 18:17:46 (GMT)
committermo <mo>2000-07-18 18:17:46 (GMT)
commitec77b534cf4c57498ee4aeed279e6cf9cd670e4c (patch)
tree1082ba6c925b4d4a16e21ed72e212b774d9c818b
parentef6fcf759b3428c4b014ea8316fd50d596550c83 (diff)
downloadtk-ec77b534cf4c57498ee4aeed279e6cf9cd670e4c.zip
tk-ec77b534cf4c57498ee4aeed279e6cf9cd670e4c.tar.gz
tk-ec77b534cf4c57498ee4aeed279e6cf9cd670e4c.tar.bz2
fix usage of TK_SRC_DIR
-rw-r--r--ChangeLog6
-rw-r--r--win/Makefile.in4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4eafb6b..a0a7dd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-18 Mo DeJong <mdejong@redhat.com>
+
+ * win/Makefile.in: Fix TCL_GENERIC_DIR variable
+ so that it uses the TK_SRC_DIR in the same way
+ as the unix version.
+
2000-07-17 David Gravereaux <davygrvy@ajubasolutions.com>
* generic/tkConsole.c: Added comments for a Win2K OS bug with
diff --git a/win/Makefile.in b/win/Makefile.in
index 924cdcc..0909b21 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.28 2000/06/15 15:56:48 ericm Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.29 2000/07/18 18:17:47 mo Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -83,7 +83,7 @@ TCL_BIN_DIR = @TCL_BIN_DIR@
# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
# been replaced by the configure script):
-TCL_GENERIC_DIR = @TCL_SRC_DIR@/../generic
+TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic
# This is a switch passed to a Cygwin script that generates file
# names based on the platform.