summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-12-15 10:23:23 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-12-15 10:23:23 (GMT)
commit3d03d92371473a9fc9f9e8c054042b59717ad120 (patch)
tree021a2a5ad4fec9557367fc537f8bb824cc71ad31
parent2a796662ec407609486a6fc38a7a768d1d13d0d3 (diff)
parent4e0313afe2507b8fb3f6dbfb4b8470e098c9f53f (diff)
downloadtcl-3d03d92371473a9fc9f9e8c054042b59717ad120.zip
tcl-3d03d92371473a9fc9f9e8c054042b59717ad120.tar.gz
tcl-3d03d92371473a9fc9f9e8c054042b59717ad120.tar.bz2
merge trunk (but 86 -> 90)
-rw-r--r--macosx/GNUmakefile2
-rw-r--r--win/README4
2 files changed, 3 insertions, 3 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index d7b0d1d..54eea8e 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -100,7 +100,7 @@ INSTALL_TARGET := install
export CPPROG := cp -p
-INSTALL_TARGETS = install-binaries install-libraries
+INSTALL_TARGETS = install-binaries install-headers install-libraries
ifeq (${EMBEDDED_BUILD},)
INSTALL_TARGETS += install-private-headers
endif
diff --git a/win/README b/win/README
index 60e9160..022dc11 100644
--- a/win/README
+++ b/win/README
@@ -79,9 +79,9 @@ Use the Makefile "install" target to install Tcl. It will install it
according to the prefix options you provided in the correct directory
structure.
-Note that in order to run tclsh85.exe, you must ensure that tcl85.dll is
+Note that in order to run tclsh90.exe, you must ensure that tcl90.dll is
on your path, in the system directory, or in the directory containing
-tclsh86.exe.
+tclsh90.exe.
Note: Tcl no longer provides support for Win32s.