summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-06-20 21:30:34 (GMT)
committerericm <ericm>2000-06-20 21:30:34 (GMT)
commit313e8992e1710691c76b7dc4d68aedbf0c088ad0 (patch)
tree186ade6e45b00d8c2b82b4d8d8039c3780fe1159
parente8c9c04e812a25ce08a60dfca669900fefebb75b (diff)
downloadtcl-313e8992e1710691c76b7dc4d68aedbf0c088ad0.zip
tcl-313e8992e1710691c76b7dc4d68aedbf0c088ad0.tar.gz
tcl-313e8992e1710691c76b7dc4d68aedbf0c088ad0.tar.bz2
Applied patch from [Bug: 5921]
-rw-r--r--ChangeLog4
-rw-r--r--unix/tclConfig.sh.in4
-rw-r--r--win/tclConfig.sh.in4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d7963e..297d204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
* library/opt0.4/optparse.tcl: Applied patch from [Bug: 5922], which
corrected an incorrect use of [string match].
+ * unix/tclConfig.sh.in:
+ * win/tclConfig.sh.in: Applied patch from [Bug: 5921], which corrects a
+ typo in the comments in these files.
+
2000-06-19 Eric Melski <ericm@scriptics.com>
* doc/RegExp.3: Replaced instances of "Tcl_GetRegExpInfo" with
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index 36df936..8be53e3 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -9,7 +9,7 @@
#
# The information in this file is specific to a single platform.
#
-# RCS: @(#) $Id: tclConfig.sh.in,v 1.13 1999/07/29 19:21:32 wart Exp $
+# RCS: @(#) $Id: tclConfig.sh.in,v 1.14 2000/06/20 21:30:34 ericm Exp $
# Tcl's version number.
TCL_VERSION='@TCL_VERSION@'
@@ -73,7 +73,7 @@ TCL_EXTRA_CFLAGS='@EXTRA_CFLAGS@'
# Base command to use for combining object files into a shared library:
TCL_SHLIB_LD='@SHLIB_LD@'
-# Base command to use for combining object files into a shared library:
+# Base command to use for combining object files into a static library:
TCL_STLIB_LD='@STLIB_LD@'
# Either '$LIBS' (if dependent libraries should be included when linking
diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in
index aaaee8d..05c56b5 100644
--- a/win/tclConfig.sh.in
+++ b/win/tclConfig.sh.in
@@ -9,7 +9,7 @@
#
# The information in this file is specific to a single platform.
#
-# RCS: @(#) $Id: tclConfig.sh.in,v 1.3 1999/07/29 19:21:32 wart Exp $
+# RCS: @(#) $Id: tclConfig.sh.in,v 1.4 2000/06/20 21:30:34 ericm Exp $
TCL_SRC_DIR="@TCL_SRC_DIR@"
@@ -82,7 +82,7 @@ TCL_EXTRA_CFLAGS='@EXTRA_CFLAGS@'
# Base command to use for combining object files into a shared library:
TCL_SHLIB_LD='@SHLIB_LD@'
-# Base command to use for combining object files into a shared library:
+# Base command to use for combining object files into a static library:
TCL_STLIB_LD='@STLIB_LD@'
# Either '$LIBS' (if dependent libraries should be included when linking