summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-28 14:20:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-28 14:20:59 (GMT)
commit94c1b49298e931f55a904a648a01c6e1d9ee27c3 (patch)
tree4b421672dba4af10dd308542c9bafdb45829daae
parent07df59f3c6f8b9224120827fd4ef65b3ebc078e2 (diff)
downloadtcl-94c1b49298e931f55a904a648a01c6e1d9ee27c3.zip
tcl-94c1b49298e931f55a904a648a01c6e1d9ee27c3.tar.gz
tcl-94c1b49298e931f55a904a648a01c6e1d9ee27c3.tar.bz2
Fix: 3 places where a superfluous TCL_MINOR_VERSION is still used where it shouldn't.
-rw-r--r--win/tcl.m42
-rw-r--r--win/tcl.rc2
-rw-r--r--win/tclsh.rc2
3 files changed, 3 insertions, 3 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 91c9465..e8e4a47 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -1212,7 +1212,7 @@ AC_DEFUN([SC_PROG_TCLSH], [
AC_DEFUN([SC_BUILD_TCLSH], [
AC_MSG_CHECKING([for tclsh in Tcl build directory])
- BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}
+ BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${EXEEXT}
AC_MSG_RESULT($BUILD_TCLSH)
AC_SUBST(BUILD_TCLSH)
])
diff --git a/win/tcl.rc b/win/tcl.rc
index 05b55e9..5e0ffbe 100644
--- a/win/tcl.rc
+++ b/win/tcl.rc
@@ -24,7 +24,7 @@ BEGIN
BLOCK "040904b0" /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */
BEGIN
VALUE "FileDescription", "Tcl DLL\0"
- VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".dll\0"
+ VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) ".dll\0"
VALUE "CompanyName", "ActiveState Corporation\0"
VALUE "FileVersion", TCL_PATCH_LEVEL
VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0"
diff --git a/win/tclsh.rc b/win/tclsh.rc
index b38c5fa..894b642 100644
--- a/win/tclsh.rc
+++ b/win/tclsh.rc
@@ -25,7 +25,7 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Tclsh Application\0"
- VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".exe\0"
+ VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) ".exe\0"
VALUE "CompanyName", "ActiveState Corporation\0"
VALUE "FileVersion", TCL_PATCH_LEVEL
VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0"