Merge 9.0

Adapt MacOS paths for Tcl9 proposed environment

generic/tclInterp.c

@@ -366,13 +366,6 @@ Tcl_Init(
      *				  External users of Tcl should not make use of
      *				  the variable to customize [tclInit].
      *
-     *	$tcl_libPath		- OBSOLETE: This variable is no longer set by
-     *				  Tcl itself, but [tclInit] examines it in
-     *				  case some program that embeds Tcl is
-     *				  customizing [tclInit] by setting this
-     *				  variable to a list of directories in which
-     *				  to search.
-     *
      *	[tcl::pkgconfig get scriptdir,runtime]
      *				- the directory determined by configure to be
      *				  the place where Tcl's script library is to
@@ -388,7 +381,7 @@ Tcl_Init(
     result = Tcl_EvalEx(interp,
 "if {[namespace which -command tclInit] eq \"\"} {\n"
 "  proc tclInit {} {\n"
-"    global tcl_libPath tcl_library env tclDefaultLibrary\n"
+"    global tcl_library env tclDefaultLibrary\n"
 "    rename tclInit {}\n"
 "    if {[info exists tcl_library]} {\n"
 "	set scripts {{set tcl_library}}\n"
@@ -410,20 +403,14 @@ Tcl_Init(
 "	lappend scripts {\n"
 "set parentDir [file dirname [file dirname [info nameofexecutable]]]\n"
 "set grandParentDir [file dirname $parentDir]\n"
-"file join $parentDir lib tcl[info tclversion]} \\\n"
-"	{file join $grandParentDir lib tcl[info tclversion]} \\\n"
+"file join $parentDir share tcl9 tcl[info tclversion]} \\\n"
+"	{file join $grandParentDir share tcl9 tcl[info tclversion]} \\\n"
 "	{file join $parentDir library} \\\n"
 "	{file join $grandParentDir library} \\\n"
 "	{file join $grandParentDir tcl[info tclversion] library} \\\n"
 "	{file join $grandParentDir tcl[info patchlevel] library} \\\n"
 "	{\n"
 "file join [file dirname $grandParentDir] tcl[info patchlevel] library}\n"
-"	if {[info exists tcl_libPath]\n"
-"		&& [catch {llength $tcl_libPath} len] == 0} {\n"
-"	    for {set i 0} {$i < $len} {incr i} {\n"
-"		lappend scripts [list lindex \\$tcl_libPath $i]\n"
-"	    }\n"
-"	}\n"
 "    }\n"
 "    set dirs {}\n"
 "    set errors {}\n"

generic/tclLoad.c

@@ -332,8 +332,8 @@ Tcl_LoadObjCmd(
 	    }
 #endif /* __CYGWIN__ */
 	    if ((pkgGuess[0] == 't') && (pkgGuess[1] == 'c')
-		    && (pkgGuess[2] == 'l')) {
-		pkgGuess += 3;
+		    && (pkgGuess[2] == 'l')&& (pkgGuess[2] == '9')) {
+		pkgGuess += 4;
 	    }
 	    for (p = pkgGuess; *p != 0; p += offset) {
 		offset = TclUtfToUniChar(p, &ch);

generic/tclZipfs.c

@@ -48,7 +48,7 @@
 #define ZIPFS_VOLUME	  "//zipfs:/"
 #define ZIPFS_VOLUME_LEN  9
 #define ZIPFS_APP_MOUNT	  "//zipfs:/app"
-#define ZIPFS_ZIP_MOUNT	  "//zipfs:/lib/tcl"
+#define ZIPFS_ZIP_MOUNT	  "//zipfs:/share/tcl"
 
 #else /* !CFG_RUNTIME_DLLFILE */
 
@@ -62,7 +62,7 @@
 #define ZIPFS_VOLUME	  "zipfs:/"
 #define ZIPFS_VOLUME_LEN  7
 #define ZIPFS_APP_MOUNT	  "zipfs:/app"
-#define ZIPFS_ZIP_MOUNT	  "zipfs:/lib/tcl"
+#define ZIPFS_ZIP_MOUNT	  "zipfs:/share/tcl"
 
 #endif /* CFG_RUNTIME_DLLFILE */
 

library/auto.tcl

@@ -145,8 +145,10 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 	}
 
 	# 3. Various locations relative to the executable
-	# ../lib/foo1.0		(From bin directory in install hierarchy)
-	# ../../lib/foo1.0	(From bin/arch directory in install hierarchy)
+	# ../share/tcl9/foo1.0		(From bin directory in install hierarchy)
+	# ../../share/tcl9/foo1.0	(From bin/arch directory in install hierarchy)
+	# ../lib/tcl9/foo1.0		(From bin directory in install hierarchy)
+	# ../../lib/tcl9/foo1.0	(From bin/arch directory in install hierarchy)
 	# ../library		(From unix directory in build hierarchy)
 	#
 	# Remaining locations are out of date (when relevant, they ought to be
@@ -160,8 +162,10 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 
         set parentDir [file dirname [file dirname [info nameofexecutable]]]
         set grandParentDir [file dirname $parentDir]
-        lappend dirs [file join $parentDir lib $basename$version]
-        lappend dirs [file join $grandParentDir lib $basename$version]
+        lappend dirs [file join $parentDir share tcl9 $basename$version]
+        lappend dirs [file join $grandParentDir share tcl9 $basename$version]
+	lappend dirs [file join $parentDir lib tcl9 $basename$version]
+	lappend dirs [file join $grandParentDir lib tcl9 $basename$version]
         lappend dirs [file join $parentDir library]
 	if {0} {
 	    lappend dirs [file join $grandParentDir library]

library/dde/pkgIndex.tcl

@@ -1,3 +1,3 @@
 if {![package vsatisfies [package provide Tcl] 8.5-]} return
 if {[info sharedlibextension] != ".dll"} return
-package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll]]
+package ifneeded dde 1.4.3 [list load [file join $dir tcl9dde14.dll]]

library/registry/pkgIndex.tcl

@@ -1,4 +1,4 @@
 if {![package vsatisfies [package provide Tcl] 8.5-]} return
 if {[info sharedlibextension] != ".dll"} return
 package ifneeded registry 1.3.5 \
-        [list load [file join $dir tclregistry13.dll]]
+        [list load [file join $dir tcl9registry13.dll]]

library/tm.tcl

@@ -323,6 +323,7 @@ proc ::tcl::tm::Defaults {} {
     # something other than [::list] in this namespace.
     roots [::list \
 	    [file dirname [info library]] \
+	    [file join [file dirname [file dirname $exe]] share] \
 	    [file join [file dirname [file dirname $exe]] lib] \
 	    ]
 

macosx/GNUmakefile

@@ -101,7 +101,7 @@ ${targets}:
 # project specific settings
 
 PROJECT			:= tcl
-PRODUCT_NAME		:= Tcl
+PRODUCT_NAME		:= Tcl9
 
 UNIX_DIR		:= ${CURDIR}/../unix
 VERSION			:= $(shell awk -F= '/^TCL_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.ac)
@@ -152,7 +152,7 @@ build-${PROJECT}: ${objdir}/Makefile
 ifeq (${INSTALL_BUILD},)
 # symolic link hackery to trick
 # 'make install INSTALL_ROOT=${OBJ_DIR}'
-# into building Tcl.framework and tclsh in ${SYMROOT}
+# into building Tcl9.framework and tclsh in ${SYMROOT}
 	@cd "${OBJ_DIR}" && mkdir -p $(dir $(subst ${space},\ ,.${LIBDIR})) $(dir $(subst ${space},\ ,.${BINDIR})) "${SYMROOT}" && \
 	rm -f ".${LIBDIR}" ".${BINDIR}" && ln -fs "${SYMROOT}" ".${LIBDIR}" && \
 	ln -fs "${SYMROOT}" ".${BINDIR}" && ln -fs "${OBJ_DIR}/tcltest" "${SYMROOT}"
@@ -163,7 +163,7 @@ ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
 	@echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
 endif
 ifeq (${EMBEDDED_BUILD},1)
-	@rm -rf "${INSTALL_ROOT}${LIBDIR}/Tcl.framework"
+	@rm -rf "${INSTALL_ROOT}${LIBDIR}/Tcl9.framework"
 endif
 	${DO_MAKE}
 ifeq (${INSTALL_BUILD},1)

macosx/README

@@ -36,8 +36,8 @@ Weak-linking is available on OS X 10.2 or later, it additionally allows Tcl
 built on 10.x to run on any 10.y with x > y >= z (for a chosen z >= 2).
 
 - Tcl extensions can be installed in any of:
-	$HOME/Library/Tcl /Library/Tcl
-	$HOME/Library/Frameworks /Library/Frameworks
+	$HOME/Library/Tcl9 /Library/Tcl9
+	$HOME/Library/Frameworks/Tcl9 /Library/Frameworks/Tcl9
 	(searched in that order).
 Given a potential package directory $pkg, Tcl on OSX checks for the file
 $pkg/Resources/Scripts/pkgIndex.tcl as well as the usual $pkg/pkgIndex.tcl.
@@ -51,8 +51,8 @@ native filesystem required), and prior to Mac OS X 10.5, only bundles can be
 [unload]ed.
 
 - The 'deploy' target of macosx/GNUmakefile installs the html manpages into the
-standard documentation location in the Tcl framework:
-	Tcl.framework/Resources/Documentation/Reference/Tcl
+standard documentation location in the Tcl9 framework:
+	Tcl9.framework/Resources/Documentation/Reference/Tcl
 No nroff manpages are installed by default by the GNUmakefile.
 
 - The Tcl framework can be installed in any of the system's standard
@@ -154,8 +154,8 @@ instead by passing an INSTALL_ROOT argument to make:
 	make -C tcl${ver}/macosx install INSTALL_ROOT="${HOME}/"
 
 - The default GNUmakefile targets will build _both_ debug and optimized versions
-of the Tcl framework with the standard convention of naming the debug library
-Tcl.framework/Tcl_debug.
+of the Tcl9 framework with the standard convention of naming the debug library
+Tcl9.framework/Tcl_debug.
 This allows switching to the debug libraries at runtime by setting
 	export DYLD_IMAGE_SUFFIX=_debug
 (c.f. man dyld for more details)

macosx/Tcl.xcode/default.pbxuser

@@ -76,7 +76,7 @@
 			{
 				active = YES;
 				name = TCLLIBPATH;
-				value = /Library/Tcl;
+				value = /Library/Tcl9;
 			},
 			{
 				active = NO;

macosx/Tcl.xcode/project.pbxproj

@@ -869,7 +869,7 @@
 		F9903CB0094FAADA004613E9 /* tclTomMathDecls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclTomMathDecls.h; sourceTree = "<group>"; };
 		F99D61180EF5573A00BBFE01 /* TclZlib.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = TclZlib.3; sourceTree = "<group>"; };
 		F9A3084B08F2D4CE00BAE1AB /* tclsh */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tclsh; sourceTree = BUILT_PRODUCTS_DIR; };
-		F9A3084E08F2D4F400BAE1AB /* Tcl.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tcl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		F9A3084E08F2D4F400BAE1AB /* Tcl9.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tcl9.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F9A493240CEBF38300B78AE2 /* chanio.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = chanio.test; sourceTree = "<group>"; };
 		F9ECB1120B26521500A28025 /* pkgIndex.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = pkgIndex.tcl; sourceTree = "<group>"; };
 		F9ECB1130B26521500A28025 /* platform.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = platform.tcl; sourceTree = "<group>"; };
@@ -912,7 +912,7 @@
 			children = (
 				F9A3084B08F2D4CE00BAE1AB /* tclsh */,
 				8DD76FB20486AB0100D96B5E /* tcltest */,
-				F9A3084E08F2D4F400BAE1AB /* Tcl.framework */,
+				F9A3084E08F2D4F400BAE1AB /* Tcl9.framework */,
 			);
 			includeInIndex = 0;
 			name = Products;

macosx/Tcl.xcodeproj/default.pbxuser

@@ -79,7 +79,7 @@
 			{
 				active = YES;
 				name = TCLLIBPATH;
-				value = /Library/Tcl;
+				value = /Library/Tcl9;
 			},
 			{
 				active = NO;

macosx/Tcl.xcodeproj/project.pbxproj

@@ -869,7 +869,7 @@
 		F9903CB0094FAADA004613E9 /* tclTomMathDecls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tclTomMathDecls.h; sourceTree = "<group>"; };
 		F99D61180EF5573A00BBFE01 /* TclZlib.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = TclZlib.3; sourceTree = "<group>"; };
 		F9A3084B08F2D4CE00BAE1AB /* tclsh */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tclsh; sourceTree = BUILT_PRODUCTS_DIR; };
-		F9A3084E08F2D4F400BAE1AB /* Tcl.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tcl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		F9A3084E08F2D4F400BAE1AB /* Tcl9.framework */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.framework; path = Tcl9.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F9A493240CEBF38300B78AE2 /* chanio.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = chanio.test; sourceTree = "<group>"; };
 		F9ECB1120B26521500A28025 /* pkgIndex.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = pkgIndex.tcl; sourceTree = "<group>"; };
 		F9ECB1130B26521500A28025 /* platform.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = platform.tcl; sourceTree = "<group>"; };
@@ -912,7 +912,7 @@
 			children = (
 				F9A3084B08F2D4CE00BAE1AB /* tclsh */,
 				8DD76FB20486AB0100D96B5E /* tcltest */,
-				F9A3084E08F2D4F400BAE1AB /* Tcl.framework */,
+				F9A3084E08F2D4F400BAE1AB /* Tcl9.framework */,
 			);
 			includeInIndex = 0;
 			name = Products;

tests/safe-stock86.test

@@ -1,117 +0,0 @@
-# safe-stock86.test --
-#
-# This file contains tests for safe Tcl that were previously in the file
-# safe.test, and use files and packages of stock Tcl 8.6 to perform the tests.
-# These files may be changed or disappear in future revisions of Tcl,
-# for example package http 1.0 will be removed from Tcl 8.7.
-#
-# The tests are replaced in safe.tcl with tests that use files provided in the
-# tests directory.  Test numbering is for comparison with similar tests in
-# safe.test.
-#
-# Sourcing this file into tcl runs the tests and generates output for errors.
-# No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution of
-# this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-package require Tcl 8.5-
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest 2
-    namespace import -force ::tcltest::*
-}
-
-foreach i [interp slaves] {
-    interp delete $i
-}
-
-set SaveAutoPath $::auto_path
-set ::auto_path [info library]
-set TestsDir [file normalize [file dirname [info script]]]
-set PathMapp [list $tcl_library TCLLIB $TestsDir TESTSDIR]
-
-proc mapList {map listIn} {
-    set listOut {}
-    foreach element $listIn {
-        lappend listOut [string map $map $element]
-    }
-    return $listOut
-}
-
-# Force actual loading of the safe package because we use un-exported (and
-# thus un-autoindexed) APIs in this test result arguments:
-catch {safe::interpConfigure}
-
-# testing that nested and statics do what is advertised (we use a static
-# package - Tcltest - but it might be absent if we're in standard tclsh)
-
-testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
-
-# high level general test
-test safe-stock86-7.1 {tests that everything works at high level, uses http 2} -body {
-    set i [safe::interpCreate]
-    # no error shall occur:
-    # (because the default access_path shall include 1st level sub dirs so
-    #  package require in a slave works like in the master)
-    set v [interp eval $i {package require http 2}]
-    # no error shall occur:
-    interp eval $i {http::config}
-    safe::interpDelete $i
-    set v
-} -match glob -result 2.*
-test safe-stock86-7.2 {tests specific path and interpFind/AddToAccessPath, uses http1.0} -body {
-    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
-    # should not add anything (p0)
-    set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p1
-    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    set confA [safe::interpConfigure $i]
-    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
-    # an error shall occur (http is not anymore in the secure 0-level
-    # provided deep path)
-    list $token1 $token2 -- \
-	    [catch {interp eval $i {package require http 1}} msg] $msg -- \
-	    $mappA -- [safe::interpDelete $i]
-} -match glob -result {{$p(:0:)} {$p(:*:)} -- 1 {can't find package http 1} --\
-        {TCLLIB */dummy/unixlike/test/path} -- {}}
-# Disable because http 1 is no longer present in the Tcl 8.7 distribution.
-test safe-stock86-7.4 {tests specific path and positive search, uses http1.0} -constraints nonPortable -body {
-    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
-    # should not add anything (p0)
-    set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p1
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
-    set confA [safe::interpConfigure $i]
-    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
-    # this time, unlike test safe-stock86-7.2, http should be found
-    list $token1 $token2 -- \
-	    [catch {interp eval $i {package require http 1}} msg] $msg -- \
-	    $mappA -- [safe::interpDelete $i]
-} -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.0 -- {TCLLIB *TCLLIB/http1.0} -- {}}
-
-# The following test checks whether the definition of tcl_endOfWord can be
-# obtained from auto_loading.  It was previously test "safe-5.1".
-test safe-stock86-9.8 {test auto-loading in safe interpreters, was test 5.1} -setup {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-} -body {
-    interp eval a {tcl_endOfWord "" 0}
-} -cleanup {
-    safe::interpDelete a
-} -result -1
-
-set ::auto_path $SaveAutoPath
-unset SaveAutoPath TestsDir PathMapp
-rename mapList {}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-# Local Variables:
-# mode: tcl
-# End:

unix/Makefile.in

@@ -835,7 +835,7 @@ clean: clean-packages
 
 distclean: distclean-packages clean
 	rm -rf Makefile config.status config.cache config.log tclConfig.sh \
-		tclConfig.h *.plist Tcl.framework tcl.pc
+		tclConfig.h *.plist Tcl9.framework tcl.pc
 	(cd dltest ; $(MAKE) distclean)
 
 depend:

unix/configure

@@ -10365,7 +10365,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/share/tcl9/tcl$(VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
 
@@ -10430,13 +10430,13 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
 $as_echo "#define TCL_FRAMEWORK 1" >>confdefs.h
 
     # Construct a fake local framework structure to make linking with
-    # '-framework Tcl' and running of tcltest work
-    ac_config_commands="$ac_config_commands Tcl.framework"
+    # '-framework Tcl9' and running of tcltest work
+    ac_config_commands="$ac_config_commands Tcl9.framework"
 
     LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
     # default install directory for bundled packages
     if test "${libdir}" = '${exec_prefix}/lib' -o "`basename ${libdir}`" = 'Frameworks'; then
-        PACKAGE_DIR="/Library/Tcl"
+        PACKAGE_DIR="/Library/Tcl9"
     else
         PACKAGE_DIR="$libdir"
     fi
@@ -10444,11 +10444,11 @@ $as_echo "#define TCL_FRAMEWORK 1" >>confdefs.h
         # override libdir default
         libdir="/Library/Frameworks"
     fi
-    TCL_LIB_FILE="Tcl"
-    TCL_LIB_FLAG="-framework Tcl"
-    TCL_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tcl"
-    TCL_LIB_SPEC="-F${libdir} -framework Tcl"
-    libdir="${libdir}/Tcl.framework/Versions/\${VERSION}"
+    TCL_LIB_FILE="Tcl9"
+    TCL_LIB_FLAG="-framework Tcl9"
+    TCL_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tcl9"
+    TCL_LIB_SPEC="-F${libdir} -framework Tcl9"
+    libdir="${libdir}/Tcl9.framework/Versions/\${VERSION}"
     TCL_LIBRARY="${libdir}/Resources/Scripts"
     includedir="${libdir}/Headers"
     PRIVATE_INCLUDE_DIR="${libdir}/PrivateHeaders"
@@ -10457,7 +10457,7 @@ $as_echo "#define TCL_FRAMEWORK 1" >>confdefs.h
     EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)/TclTOC.html"'
     EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tcl-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
     EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
-    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tcl.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tclConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
+    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tcl9.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tclConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
     # Don't use AC_DEFINE for the following as the framework version define
     # needs to go into the Makefile even when using autoheader, so that we
     # can pick up a potential make override of VERSION. Also, don't put this
@@ -10484,19 +10484,19 @@ VERSION=${TCL_VERSION}
 #--------------------------------------------------------------------
 #	The statements below define the symbol TCL_PACKAGE_PATH, which
 #	gives a list of directories that may contain packages.  The list
-#	consists of one directory for machine-dependent binaries and
-#	another for platform-independent scripts.
+#	consists of at least one directory for machine-dependent binaries
+#	and another for platform-independent scripts.
 #--------------------------------------------------------------------
 
 if test "$FRAMEWORK_BUILD" = "1" ; then
     test -z "$TCL_PACKAGE_PATH" && \
-	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks"
+	TCL_PACKAGE_PATH="~/Library/Tcl9 /Library/Tcl9"
     test -z "$TCL_MODULE_PATH"  && \
-	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
+	TCL_MODULE_PATH="~/Library/Tcl9 /Library/Tcl9"
 elif test "$prefix/lib" != "$libdir"; then
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}/tcl9} {${prefix}/share/tcl9} {${prefix}/lib/tcl9} ${TCL_PACKAGE_PATH}"
 else
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/share/tcl9} {${prefix}/lib/tcl9} ${TCL_PACKAGE_PATH}"
 fi
 
 #--------------------------------------------------------------------
@@ -11296,7 +11296,7 @@ do
   case $ac_config_target in
     "Tcl-Info.plist") CONFIG_FILES="$CONFIG_FILES Tcl-Info.plist:../macosx/Tcl-Info.plist.in" ;;
     "Tclsh-Info.plist") CONFIG_FILES="$CONFIG_FILES Tclsh-Info.plist:../macosx/Tclsh-Info.plist.in" ;;
-    "Tcl.framework") CONFIG_COMMANDS="$CONFIG_COMMANDS Tcl.framework" ;;
+    "Tcl9.framework") CONFIG_COMMANDS="$CONFIG_COMMANDS Tcl9.framework" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
     "dltest/Makefile") CONFIG_FILES="$CONFIG_FILES dltest/Makefile:../unix/dltest/Makefile.in" ;;
     "tclConfig.sh") CONFIG_FILES="$CONFIG_FILES tclConfig.sh:../unix/tclConfig.sh.in" ;;
@@ -11719,7 +11719,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "Tcl.framework":C) n=Tcl &&
+    "Tcl9.framework":C) n=Tcl9 &&
         f=$n.framework && v=Versions/$VERSION &&
         rm -rf $f && mkdir -p $f/$v/Resources &&
         ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&

unix/configure.ac

@@ -862,7 +862,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/share/tcl9/tcl$(VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
 
@@ -886,8 +886,8 @@ fi
 if test "$FRAMEWORK_BUILD" = "1" ; then
     AC_DEFINE(TCL_FRAMEWORK, 1, [Is Tcl built as a framework?])
     # Construct a fake local framework structure to make linking with
-    # '-framework Tcl' and running of tcltest work
-    AC_CONFIG_COMMANDS([Tcl.framework], [n=Tcl &&
+    # '-framework Tcl9' and running of tcltest work
+    AC_CONFIG_COMMANDS([Tcl9.framework], [n=Tcl9 &&
         f=$n.framework && v=Versions/$VERSION &&
         rm -rf $f && mkdir -p $f/$v/Resources &&
         ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&
@@ -897,7 +897,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
     LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
     # default install directory for bundled packages
     if test "${libdir}" = '${exec_prefix}/lib' -o "`basename ${libdir}`" = 'Frameworks'; then
-        PACKAGE_DIR="/Library/Tcl"
+        PACKAGE_DIR="/Library/Tcl9"
     else
         PACKAGE_DIR="$libdir"
     fi
@@ -905,11 +905,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
         # override libdir default
         libdir="/Library/Frameworks"
     fi
-    TCL_LIB_FILE="Tcl"
-    TCL_LIB_FLAG="-framework Tcl"
-    TCL_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tcl"
-    TCL_LIB_SPEC="-F${libdir} -framework Tcl"
-    libdir="${libdir}/Tcl.framework/Versions/\${VERSION}"
+    TCL_LIB_FILE="Tcl9"
+    TCL_LIB_FLAG="-framework Tcl9"
+    TCL_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tcl9"
+    TCL_LIB_SPEC="-F${libdir} -framework Tcl9"
+    libdir="${libdir}/Tcl9.framework/Versions/\${VERSION}"
     TCL_LIBRARY="${libdir}/Resources/Scripts"
     includedir="${libdir}/Headers"
     PRIVATE_INCLUDE_DIR="${libdir}/PrivateHeaders"
@@ -918,7 +918,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
     EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)/TclTOC.html"'
     EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tcl-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
     EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
-    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tcl.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tclConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
+    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tcl9.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tclConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
     # Don't use AC_DEFINE for the following as the framework version define
     # needs to go into the Makefile even when using autoheader, so that we
     # can pick up a potential make override of VERSION. Also, don't put this
@@ -945,19 +945,19 @@ VERSION=${TCL_VERSION}
 #--------------------------------------------------------------------
 #	The statements below define the symbol TCL_PACKAGE_PATH, which
 #	gives a list of directories that may contain packages.  The list
-#	consists of one directory for machine-dependent binaries and
-#	another for platform-independent scripts.
+#	consists of at least one directory for machine-dependent binaries
+#	and another for platform-independent scripts.
 #--------------------------------------------------------------------
 
 if test "$FRAMEWORK_BUILD" = "1" ; then
     test -z "$TCL_PACKAGE_PATH" && \
-	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks"
+	TCL_PACKAGE_PATH="~/Library/Tcl9 /Library/Tcl9"
     test -z "$TCL_MODULE_PATH"  && \
-	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
+	TCL_MODULE_PATH="~/Library/Tcl9 /Library/Tcl9"
 elif test "$prefix/lib" != "$libdir"; then
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}/tcl9} {${prefix}/share/tcl9} {${prefix}/lib/tcl9} ${TCL_PACKAGE_PATH}"
 else
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/share/tcl9} {${prefix}/lib/tcl9} ${TCL_PACKAGE_PATH}"
 fi
 
 #--------------------------------------------------------------------

unix/dltest/Makefile.in

@@ -25,7 +25,7 @@ LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
 CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
 	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
-all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX} pkgooa${SHLIB_SUFFIX}
+all: tcl9pkga${SHLIB_SUFFIX} tcl9pkgb${SHLIB_SUFFIX} tcl9pkgc${SHLIB_SUFFIX} tcl9pkgd${SHLIB_SUFFIX} tcl9pkge${SHLIB_SUFFIX} tcl9pkgua${SHLIB_SUFFIX} tcl9pkgooa${SHLIB_SUFFIX}
 	@if test -n "$(DLTEST_SUFFIX)"; then $(MAKE) dltest_suffix; fi
 	@touch ../dltest.marker
 
@@ -53,25 +53,25 @@ pkgua.o: $(SRC_DIR)/pkgua.c
 pkgooa.o: $(SRC_DIR)/pkgooa.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgooa.c
 
-pkga${SHLIB_SUFFIX}: pkga.o
+tcl9pkga${SHLIB_SUFFIX}: pkga.o
 	${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o ${SHLIB_LD_LIBS}
 
-pkgb${SHLIB_SUFFIX}: pkgb.o
+tcl9pkgb${SHLIB_SUFFIX}: pkgb.o
 	${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${SHLIB_LD_LIBS}
 
-pkgc${SHLIB_SUFFIX}: pkgc.o
+tcl9pkgc${SHLIB_SUFFIX}: pkgc.o
 	${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${SHLIB_LD_LIBS}
 
-pkgd${SHLIB_SUFFIX}: pkgd.o
+tcl9pkgd${SHLIB_SUFFIX}: pkgd.o
 	${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${SHLIB_LD_LIBS}
 
-pkge${SHLIB_SUFFIX}: pkge.o
+tcl9pkge${SHLIB_SUFFIX}: pkge.o
 	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
 
-pkgua${SHLIB_SUFFIX}: pkgua.o
+tcl9pkgua${SHLIB_SUFFIX}: pkgua.o
 	${SHLIB_LD} -o pkgua${SHLIB_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
 
-pkgooa${SHLIB_SUFFIX}: pkgooa.o
+tcl9pkgooa${SHLIB_SUFFIX}: pkgooa.o
 	${SHLIB_LD} -o pkgooa${SHLIB_SUFFIX} pkgooa.o ${SHLIB_LD_LIBS}
 
 pkga${DLTEST_SUFFIX}: pkga.o

unix/tcl.m4

@@ -78,8 +78,8 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
 			`ls -d /Library/Frameworks 2>/dev/null` \
 			`ls -d /Network/Library/Frameworks 2>/dev/null` \
 			; do
-		    if test -f "$i/Tcl.framework/tclConfig.sh" ; then
-			ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`"
+		    if test -f "$i/Tcl9.framework/tclConfig.sh" ; then
+			ac_cv_c_tclconfig="`(cd $i/Tcl9.framework; pwd)`"
 			break
 		    fi
 		done
@@ -306,7 +306,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
     elif test "`uname -s`" = "Darwin"; then
 	# If Tcl was built as a framework, attempt to use the libraries
 	# from the framework at the given location so that linking works
-	# against Tcl.framework installed in an arbitrary location.
+	# against Tcl9.framework installed in an arbitrary location.
 	case ${TCL_DEFS} in
 	    *TCL_FRAMEWORK*)
 		if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then

unix/tclUnixInit.c

@@ -490,7 +490,7 @@ TclpInitLibraryPath(
 	 * installed.
 	 */
 
-	sprintf(installLib, "lib/tcl%s", TCL_VERSION);
+	sprintf(installLib, "share/tcl9/tcl%s", TCL_VERSION);
 
 	/*
 	 * If TCL_LIBRARY is set, search there.

win/Makefile.in

@@ -35,7 +35,7 @@ INSTALL_ROOT	=
 # Directory from which applications will reference the library of Tcl scripts
 # (note: you can set the TCL_LIBRARY environment variable at run-time to
 # override this value):
-TCL_LIBRARY	= $(prefix)/lib/tcl$(VERSION)
+TCL_LIBRARY	= $(prefix)/share/tcl9/tcl$(VERSION)
 
 # Path to use at runtime to refer to LIB_INSTALL_DIR:
 LIB_RUNTIME_DIR		= $(libdir)
@@ -148,17 +148,17 @@ TCL_VFS_ROOT		= libtcl.vfs
 TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
 TCL_DLL_FILE		= @TCL_DLL_FILE@
 TCL_LIB_FILE		= @TCL_LIB_FILE@
-DDE_DLL_FILE		= tcldde$(DDEVER)${DLLSUFFIX}
+DDE_DLL_FILE		= tcl9dde$(DDEVER)${DLLSUFFIX}
 DDE_LIB_FILE		= @LIBPREFIX@tcldde$(DDEVER)${DLLSUFFIX}${LIBSUFFIX}
-REG_DLL_FILE		= tclregistry$(REGVER)${DLLSUFFIX}
+REG_DLL_FILE		= tcl9registry$(REGVER)${DLLSUFFIX}
 REG_LIB_FILE		= @LIBPREFIX@tclregistry$(REGVER)${DLLSUFFIX}${LIBSUFFIX}
 TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
 TEST_EXE_FILE		= tcltest${EXESUFFIX}
 TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${DLLSUFFIX}${LIBSUFFIX}
 TEST_LOAD_PRMS		= lappend ::auto_path {$(ROOT_DIR_WIN_NATIVE)/tests};\
-			  package ifneeded dde 1.4.3 [list load [file normalize ${DDE_DLL_FILE}]];\
-			  package ifneeded registry 1.3.5 [list load [file normalize ${REG_DLL_FILE}]]
-TEST_LOAD_FACILITIES	= package ifneeded tcl::test ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\
+			  package ifneeded dde 1.4.3 [list load ${DDE_DLL_FILE}];\
+			  package ifneeded registry 1.3.5 [list load ${REG_DLL_FILE}]
+TEST_LOAD_FACILITIES	= package ifneeded tcl::test ${VERSION}@TCL_PATCH_LEVEL@ [list load ${TEST_DLL_FILE} Tcltest];\
 			  $(TEST_LOAD_PRMS)
 ZLIB_DLL_FILE		= zlib1.dll
 TOMMATH_DLL_FILE		= libtommath.dll
@@ -790,7 +790,7 @@ install-binaries: binaries
 		else true; \
 		fi; \
 	    done;
-	@for i in dde${DDEDOTVER} registry${REGDOTVER}; \
+	@for i in tcl9 tcl9/dde${DDEDOTVER} tcl9/registry${REGDOTVER}; \
 	    do \
 	    if [ ! -d "$(LIB_INSTALL_DIR)/$$i" ] ; then \
 		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
@@ -814,23 +814,23 @@ install-binaries: binaries
 	    done
 	@if [ -f $(DDE_DLL_FILE) ]; then \
 	    echo Installing $(DDE_DLL_FILE); \
-	    $(COPY) $(DDE_DLL_FILE) "$(LIB_INSTALL_DIR)/dde${DDEDOTVER}"; \
+	    $(COPY) $(DDE_DLL_FILE) "$(LIB_INSTALL_DIR)/tcl9/dde${DDEDOTVER}"; \
 	    $(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
-		"$(LIB_INSTALL_DIR)/dde${DDEDOTVER}"; \
+		"$(LIB_INSTALL_DIR)/tcl9/dde${DDEDOTVER}"; \
 	    fi
 	@if [ -f $(DDE_LIB_FILE) ]; then \
 	    echo Installing $(DDE_LIB_FILE); \
-	    $(COPY) $(DDE_LIB_FILE) "$(LIB_INSTALL_DIR)/dde${DDEDOTVER}"; \
+	    $(COPY) $(DDE_LIB_FILE) "$(LIB_INSTALL_DIR)"; \
 	    fi
 	@if [ -f $(REG_DLL_FILE) ]; then \
 	    echo Installing $(REG_DLL_FILE); \
-	    $(COPY) $(REG_DLL_FILE) "$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
+	    $(COPY) $(REG_DLL_FILE) "$(LIB_INSTALL_DIR)/tcl9/registry${REGDOTVER}"; \
 	    $(COPY) $(ROOT_DIR)/library/registry/pkgIndex.tcl \
-		"$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
+		"$(LIB_INSTALL_DIR)/tcl9/registry${REGDOTVER}"; \
 	    fi
 	@if [ -f $(REG_LIB_FILE) ]; then \
 	    echo Installing $(REG_LIB_FILE); \
-	    $(COPY) $(REG_LIB_FILE) "$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
+	    $(COPY) $(REG_LIB_FILE) "$(LIB_INSTALL_DIR)"; \
 	    fi
 
 install-libraries-zipfs-shared: libraries
@@ -839,7 +839,7 @@ install-libraries-zipfs-static: install-libraries-zipfs-shared
 	$(COPY) ${TCL_ZIP_FILE} "$(LIB_INSTALL_DIR)"
 
 install-libraries: libraries install-tzdata install-msgs
-	@for i in "$(prefix)/lib" "$(INCLUDE_INSTALL_DIR)" \
+	@for i in "$(prefix)/lib" "$(prefix)/share" "$(INCLUDE_INSTALL_DIR)" \
 		"$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
 	    do \
 	    if [ ! -d "$$i" ] ; then \

win/configure

@@ -5304,9 +5304,9 @@ fi
 #--------------------------------------------------------------------
 
 if test "$prefix/lib" != "$libdir"; then
-    TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib}"
+    TCL_PACKAGE_PATH="{${libdir}/tcl9} {${prefix}/share/tcl9} {${prefix}/lib/tcl9}"
 else
-    TCL_PACKAGE_PATH="{${prefix}/lib}"
+    TCL_PACKAGE_PATH="{${prefix}/share/tcl9} {${prefix}/lib/tcl9}"
 fi
 
 # The tclsh.exe.manifest requires these

win/configure.ac

@@ -383,9 +383,9 @@ fi
 #--------------------------------------------------------------------
 
 if test "$prefix/lib" != "$libdir"; then
-    TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib}"
+    TCL_PACKAGE_PATH="{${libdir}/tcl9} {${prefix}/share/tcl9} {${prefix}/lib/tcl9}"
 else
-    TCL_PACKAGE_PATH="{${prefix}/lib}"
+    TCL_PACKAGE_PATH="{${prefix}/share/tcl9} {${prefix}/lib/tcl9}"
 fi
 
 # The tclsh.exe.manifest requires these

win/makefile.vc

@@ -184,10 +184,10 @@ DDEVERSION = $(DDEDOTVERSION:.=)
 REGDOTVERSION = 1.3
 REGVERSION = $(REGDOTVERSION:.=)
 
-TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
+TCLREGLIBNAME	= tcl9registry$(REGVERSION)$(SUFX:t=).$(EXT)
 TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)
 
-TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
+TCLDDELIBNAME	= tcl9dde$(DDEVERSION)$(SUFX:t=).$(EXT)
 TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)
 
 TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe
@@ -920,6 +920,8 @@ install-binaries:
 	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
 
 install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
+	@if not exist "$(MODULE_INSTALL_DIR)" \
+		$(MKDIR) "$(MODULE_INSTALL_DIR)"
 	@if not exist "$(SCRIPT_INSTALL_DIR)" \
 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
 	@if not exist "$(SCRIPT_INSTALL_DIR)\opt0.4$(NULL)" \
@@ -981,15 +983,17 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module
 	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \
 	    "$(MODULE_INSTALL_DIR)\9.0\platform\shell-$(PKG_SHELL_VER).tm"
+	@if not exist "$(LIB_INSTALL_DIR))\tcl9$(NULL)" \
+		$(MKDIR) "$(LIB_INSTALL_DIR)\tcl9"
 	@echo Installing $(TCLDDELIBNAME)
 !if $(STATIC_BUILD)
 !if !$(TCL_USE_STATIC_PACKAGES)
 	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"
 !endif
 !else
-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\tcl9\dde$(DDEDOTVERSION)\"
 	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+	    "$(LIB_INSTALL_DIR)\tcl9\dde$(DDEDOTVERSION)\"
 !endif
 	@echo Installing $(TCLREGLIBNAME)
 !if $(STATIC_BUILD)
@@ -997,9 +1001,9 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"
 !endif
 !else
-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\registry$(REGDOTVERSION)\"
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\tcl9\registry$(REGDOTVERSION)\"
 	@$(CPY) "$(ROOT)\library\registry\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\registry$(REGDOTVERSION)\"
+	    "$(LIB_INSTALL_DIR)\tcl9\registry$(REGDOTVERSION)\"
 !endif
 	@echo Installing encodings
 	@$(CPY) "$(ROOT)\library\encoding\*.enc" \

win/rules.vc

@@ -1120,8 +1120,8 @@ TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib
 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib
 !endif
 TCL_LIBRARY	= $(_TCLDIR)\lib
-TCLREGLIB	= $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib
-TCLDDELIB	= $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib
+TCLREGLIB	= $(_TCLDIR)\lib\tcl9registry13$(SUFX:t=).lib
+TCLDDELIB	= $(_TCLDIR)\lib\tcl9dde14$(SUFX:t=).lib
 TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
 TCL_INCLUDES    = -I"$(_TCLDIR)\include"
 
@@ -1139,8 +1139,8 @@ TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib
 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib
 !endif
 TCL_LIBRARY	= $(_TCLDIR)\library
-TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib
-TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib
+TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl9registry13$(SUFX:t=).lib
+TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl9dde14$(SUFX:t=).lib
 TCLTOOLSDIR	= $(_TCLDIR)\tools
 TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 
@@ -1239,8 +1239,13 @@ LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
 BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
 DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
 !if $(DOING_TCL)
+!if $(TCL_MAJOR_VERSION) > 8
+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\share\tcl$(TCL_MAJOR_VERSION)\$(PROJECT)$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+MODULE_INSTALL_DIR	= $(_INSTALLDIR)\share\tcl$(TCL_MAJOR_VERSION)
+!else
 SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
-MODULE_INSTALL_DIR	= $(_INSTALLDIR)\lib\tcl$(TCL_MAJOR_VERSION)
+MODULE_INSTALL_DIR	= $(_INSTALLDIR)\lib
+!endif
 !else # DOING_TK
 SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
 !endif

win/tclWinInit.c

@@ -197,7 +197,7 @@ TclpInitLibraryPath(
      * installed DLL.
      */
 
-    sprintf(installLib, "lib/tcl%s", TCL_VERSION);
+    sprintf(installLib, "share/tcl9/tcl%s", TCL_VERSION);
 
     /*
      * Look for the library relative to the TCL_LIBRARY env variable. If the
@@ -360,7 +360,7 @@ InitializeDefaultLibraryDir(
     *end = '\\';
 
     TclWinNoBackslash(name);
-    sprintf(end + 1, "lib/tcl%s", TCL_VERSION);
+    sprintf(end + 1, "share/tcl9/tcl%s", TCL_VERSION);
     *lengthPtr = strlen(name);
     *valuePtr = (char *)Tcl_Alloc(*lengthPtr + 1);
     *encodingPtr = NULL;