Merge 8.6

7 files changed, 170 insertions, 156 deletions

diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 9edb724..0604708 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -724,7 +724,7 @@ TkpConfigureMenuEntry(
      * The -background and -foreground options are now ignored in Aqua.
      * See ticket [635167af14].
      */
-    
+
     NSDictionary fontAttributes = TkMacOSXNSFontAttributesForFont(
 	Tk_GetFontFromObj(mePtr->menuPtr->tkwin, fontPtr));
     NSMutableDictionary *attributes = [fontAttributes mutableCopy];
@@ -751,10 +751,10 @@ TkpConfigureMenuEntry(
     }
 
 #else
-    
+
     NSDictionary *attributes = TkMacOSXNSFontAttributesForFont(
 	Tk_GetFontFromObj(mePtr->menuPtr->tkwin, fontPtr));
-    
+
 #endif
 
     attributedTitle = [[NSAttributedString alloc] initWithString:title
diff --git a/tests/pack.test b/tests/pack.test
index b86fa34..f365959 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1551,7 +1551,7 @@ test pack-17.2 {PackLostContentProc procedure} -setup {
     pack info .pack.a
 } -returnCodes error -result {window ".pack.a" isn't packed}
 
-if {[tk windowingsystem] == "win32"} {
+if {[tk windowingsystem] ne "aqua"} {
     proc packUpdate {} {
 	update
     }
diff --git a/tests/place.test b/tests/place.test
index 5813ac5..a809095 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -261,7 +261,7 @@ test place-7.10 {ReconfigurePlacement procedure, computing size} -setup {
     list [winfo width .t.f2] [winfo height .t.f2]
 } -result {30 60}
 
-if {[tk windowingsystem] == "win32"} {
+if {[tk windowingsystem] ne "aqua"} {
     proc placeUpdate {} {
 	update
     }
diff --git a/tests/winDialog.test b/tests/winDialog.test
index a0dbc8d..1384770 100755
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -593,7 +593,7 @@ test winDialog-5.12.6 {tk_getSaveFile: initial directory: relative} -constraints
 
 test winDialog-5.12.7 {tk_getOpenFile: initial directory: ~} -setup {
     # Ensure there's at least one file in the home directory in CI environments
-    set makeEmpty [expr {![llength [glob -type f -directory ~ *]]}]
+    set makeEmpty [expr {![llength [glob -nocomplain -type f -directory ~ *]]}]
     if {$makeEmpty} {
 	for {set i 1} {$i < 1000} {incr i} {
 	    # Technically a race condition...
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 6ffc035..72d97c8 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -4,9 +4,6 @@
     #ifndef _TKCONFIG
     #define _TKCONFIG
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* Define to 1 if you have the <AvailabilityMacros.h> header file. */
 #undef HAVE_AVAILABILITYMACROS_H
 
@@ -133,9 +130,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -184,17 +178,9 @@
 /* Do we want to use the threaded memory allocator? */
 #undef USE_THREAD_ALLOC
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
 /* Is XKeycodeToKeysym deprecated? */
 #undef XKEYCODETOKEYSYM_IS_DEPRECATED
@@ -252,7 +238,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */
diff --git a/win/rules-ext.vc b/win/rules-ext.vc
index 58c70fa..6da5689 100644
--- a/win/rules-ext.vc
+++ b/win/rules-ext.vc
@@ -31,11 +31,11 @@ macro to the name of the project makefile.
 # We extract version numbers using the nmakehlp program. For now use

 # the local copy of nmakehlp. Once we locate Tcl, we will use that

 # one if it is newer.

-!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]

+!if [$(CC) -nologo -DNDEBUG "nmakehlp.c" -link -subsystem:console > nul]

 !endif

 

 # First locate the Tcl directory that we are working with.

-!ifdef TCLDIR

+!if "$(TCLDIR)" != ""

 

 _RULESDIR = $(TCLDIR:/=\)

 

diff --git a/win/rules.vc b/win/rules.vc
index 76d93cd1..d966066 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 7

+RULES_VERSION_MINOR = 8

 

 # The PROJECT macro must be defined by parent makefile.

 !if "$(PROJECT)" == ""

@@ -652,8 +652,130 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 !endif

 !endif

 

+

+################################################################

+# 6. Extract various version numbers from headers

+# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h

+# respectively. For extensions, versions are extracted from the

+# configure.in or configure.ac from the TEA configuration if it

+# exists, and unset otherwise.

+# Sets the following macros:

+# TCL_MAJOR_VERSION

+# TCL_MINOR_VERSION

+# TCL_RELEASE_SERIAL

+# TCL_PATCH_LEVEL

+# TCL_PATCH_LETTER

+# TCL_VERSION

+# TK_MAJOR_VERSION

+# TK_MINOR_VERSION

+# TK_RELEASE_SERIAL

+# TK_PATCH_LEVEL

+# TK_PATCH_LETTER

+# TK_VERSION

+# DOTVERSION - set as (for example) 2.5

+# VERSION - set as (for example 25)

+#--------------------------------------------------------------

+

+!if [echo REM = This file is generated from rules.vc > versions.vc]

+!endif

+!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]

+!endif

+!if [echo TCL_MINOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]

+!endif

+!if [echo TCL_RELEASE_SERIAL = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_RELEASE_SERIAL >> versions.vc]

+!endif

+!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]

+!endif

+

+!if defined(_TK_H)

+!if [echo TK_MAJOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]

+!endif

+!if [echo TK_MINOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]

+!endif

+!if [echo TK_RELEASE_SERIAL = \>> versions.vc] \

+   && [nmakehlp -V "$(_TK_H)" TK_RELEASE_SERIAL >> versions.vc]

+!endif

+!if [echo TK_PATCH_LEVEL = \>> versions.vc] \

+   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]

+!endif

+!endif # _TK_H

+

+!include versions.vc

+

+TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

+TCL_DOTVERSION	= $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+!if [nmakehlp -f $(TCL_PATCH_LEVEL) "a"]

+TCL_PATCH_LETTER = a

+!elseif [nmakehlp -f $(TCL_PATCH_LEVEL) "b"]

+TCL_PATCH_LETTER = b

+!else

+TCL_PATCH_LETTER = .

+!endif

+

+!if defined(_TK_H)

+

+TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)

+TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

+!if [nmakehlp -f $(TK_PATCH_LEVEL) "a"]

+TK_PATCH_LETTER = a

+!elseif [nmakehlp -f $(TK_PATCH_LEVEL) "b"]

+TK_PATCH_LETTER = b

+!else

+TK_PATCH_LETTER = .

+!endif

+

+!endif

+

+# Set DOTVERSION and VERSION

+!if $(DOING_TCL)

+

+DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+VERSION = $(TCL_VERSION)

+

+!elseif $(DOING_TK)

+

+DOTVERSION = $(TK_DOTVERSION)

+VERSION = $(TK_VERSION)

+

+!else # Doing a non-Tk extension

+

+# If parent makefile has not defined DOTVERSION, try to get it from TEA

+# first from a configure.in file, and then from configure.ac

+!ifndef DOTVERSION

+!if [echo DOTVERSION = \> versions.vc] \

+   || [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]

+!if [echo DOTVERSION = \> versions.vc] \

+   || [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]

+!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.

+!endif

+!endif

+!include versions.vc

+!endif # DOTVERSION

+VERSION         = $(DOTVERSION:.=)

+

+!endif # $(DOING_TCL) ... etc.

+

+# Windows RC files have 3 version components. Ensure this irrespective

+# of how many components the package has specified. Basically, ensure

+# minimum 4 components by appending 4 0's and then pick out the first 4.

+# Also take care of the fact that DOTVERSION may have "a" or "b" instead

+# of "." separating the version components.

+DOTSEPARATED=$(DOTVERSION:a=.)

+DOTSEPARATED=$(DOTSEPARATED:b=.)

+!if [echo RCCOMMAVERSION = \> versions.vc] \

+  || [for /f "tokens=1,2,3,4,5* delims=." %a in ("$(DOTSEPARATED).0.0.0.0") do echo %a,%b,%c,%d >> versions.vc]

+!error *** Could not generate RCCOMMAVERSION ***

+!endif

+!include versions.vc

+

 ########################################################################

-# 6. Parse the OPTS macro to work out the requested build configuration.

+# 7. Parse the OPTS macro to work out the requested build configuration.

 # Based on this, we will construct the actual switches to be passed to the

 # compiler and linker using the macros defined in the previous section.

 # The following macros are defined by this section based on OPTS

@@ -725,7 +847,7 @@ MSVCRT		= 0
 !if [nmakehlp -f $(OPTS) "msvcrt"]

 !message *** Doing msvcrt

 !else

-!if "$(TCL_MAJOR_VERSION)" == "8" && "$(TCL_MINOR_VERSION)" < "7" && $(STATIC_BUILD)

+!if $(TCL_MAJOR_VERSION) == 8 && $(TCL_MINOR_VERSION) < 7 && $(STATIC_BUILD)

 MSVCRT		= 0

 !endif

 !endif

@@ -742,7 +864,7 @@ TCL_THREADS = 0
 USE_THREAD_ALLOC= 0

 !endif

 

-!if "$(TCL_MAJOR_VERSION)" == "8"

+!if $(TCL_MAJOR_VERSION) == 8

 !if [nmakehlp -f $(OPTS) "time64bit"]

 !message *** Force 64-bit time_t

 _USE_64BIT_TIME_T = 1

@@ -837,7 +959,7 @@ This compiler does not support profile guided optimization.
 !endif

 

 ################################################################

-# 7. Parse the STATS macro to configure code instrumentation

+# 8. Parse the STATS macro to configure code instrumentation

 # The following macros are set by this section:

 # TCL_MEM_DEBUG - 1 -> enables memory allocation instrumentation

 #                 0 -> disables

@@ -867,7 +989,7 @@ TCL_COMPILE_DEBUG   = 0
 !endif

 

 ####################################################################

-# 8. Parse the CHECKS macro to configure additional compiler checks

+# 9. Parse the CHECKS macro to configure additional compiler checks

 # The following macros are set by this section:

 # WARNINGS - compiler switches that control the warnings level

 # TCL_NO_DEPRECATED - 1 -> disable support for deprecated functions

@@ -899,126 +1021,6 @@ WARNINGS		    = $(WARNINGS) -Wp64
 

 !endif

 

-################################################################

-# 9. Extract various version numbers

-# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h

-# respectively. For extensions, versions are extracted from the

-# configure.in or configure.ac from the TEA configuration if it

-# exists, and unset otherwise.

-# Sets the following macros:

-# TCL_MAJOR_VERSION

-# TCL_MINOR_VERSION

-# TCL_RELEASE_SERIAL

-# TCL_PATCH_LEVEL

-# TCL_PATCH_LETTER

-# TCL_VERSION

-# TK_MAJOR_VERSION

-# TK_MINOR_VERSION

-# TK_RELEASE_SERIAL

-# TK_PATCH_LEVEL

-# TK_PATCH_LEVEL

-# TK_VERSION

-# DOTVERSION - set as (for example) 2.5

-# VERSION - set as (for example 25)

-#--------------------------------------------------------------

-

-!if [echo REM = This file is generated from rules.vc > versions.vc]

-!endif

-!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]

-!endif

-!if [echo TCL_MINOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]

-!endif

-!if [echo TCL_RELEASE_SERIAL = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_RELEASE_SERIAL >> versions.vc]

-!endif

-!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]

-!endif

-

-!if defined(_TK_H)

-!if [echo TK_MAJOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]

-!endif

-!if [echo TK_MINOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]

-!endif

-!if [echo TK_RELEASE_SERIAL = \>> versions.vc] \

-   && [nmakehlp -V "$(_TK_H)" TK_RELEASE_SERIAL >> versions.vc]

-!endif

-!if [echo TK_PATCH_LEVEL = \>> versions.vc] \

-   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]

-!endif

-!endif # _TK_H

-

-!include versions.vc

-

-TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

-TCL_DOTVERSION	= $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

-!if [nmakehlp -f $(TCL_PATCH_LEVEL) "a"]

-TCL_PATCH_LETTER = a

-!elseif [nmakehlp -f $(TCL_PATCH_LEVEL) "b"]

-TCL_PATCH_LETTER = b

-!else

-TCL_PATCH_LETTER = .

-!endif

-

-!if defined(_TK_H)

-

-TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)

-TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

-!if [nmakehlp -f $(TK_PATCH_LEVEL) "a"]

-TK_PATCH_LETTER = a

-!elseif [nmakehlp -f $(TK_PATCH_LEVEL) "b"]

-TK_PATCH_LETTER = b

-!else

-TK_PATCH_LETTER = .

-!endif

-

-!endif

-

-# Set DOTVERSION and VERSION

-!if $(DOING_TCL)

-

-DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

-VERSION = $(TCL_VERSION)

-

-!elseif $(DOING_TK)

-

-DOTVERSION = $(TK_DOTVERSION)

-VERSION = $(TK_VERSION)

-

-!else # Doing a non-Tk extension

-

-# If parent makefile has not defined DOTVERSION, try to get it from TEA

-# first from a configure.in file, and then from configure.ac

-!ifndef DOTVERSION

-!if [echo DOTVERSION = \> versions.vc] \

-   || [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]

-!if [echo DOTVERSION = \> versions.vc] \

-   || [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]

-!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.

-!endif

-!endif

-!include versions.vc

-!endif # DOTVERSION

-VERSION         = $(DOTVERSION:.=)

-

-!endif # $(DOING_TCL) ... etc.

-

-# Windows RC files have 3 version components. Ensure this irrespective

-# of how many components the package has specified. Basically, ensure

-# minimum 4 components by appending 4 0's and then pick out the first 4.

-# Also take care of the fact that DOTVERSION may have "a" or "b" instead

-# of "." separating the version components.

-DOTSEPARATED=$(DOTVERSION:a=.)

-DOTSEPARATED=$(DOTSEPARATED:b=.)

-!if [echo RCCOMMAVERSION = \> versions.vc] \

-  || [for /f "tokens=1,2,3,4,5* delims=." %a in ("$(DOTSEPARATED).0.0.0.0") do echo %a,%b,%c,%d >> versions.vc]

-!error *** Could not generate RCCOMMAVERSION ***

-!endif

-!include versions.vc

 

 ################################################################

 # 10. Construct output directory and file paths

@@ -1115,14 +1117,29 @@ OUT_DIR	    = $(TMP_DIR)
 # The name of the stubs library for the project being built

 STUBPREFIX      = $(PROJECT)stub

 

+#

 # Set up paths to various Tcl executables and libraries needed by extensions

-!if $(DOING_TCL)

+#

 

+# TIP 430. Unused for 8.6 but no harm defining it to allow a common rules.vc

+!if "$(TCL_PATCH_LETTER)" == "."

+TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_RELEASE_SERIAL).zip

+!else

+TCLSCRIPTZIPNAME = libtcl_$(TCL_MAJOR_VERSION)_$(TCL_MINOR_VERSION)_$(TCL_PATCH_LETTER)$(TCL_RELEASE_SERIAL).zip

+!endif

+!if "$(TK_PATCH_LETTER)" == "."

+TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_RELEASE_SERIAL).zip

+!else

+TKSCRIPTZIPNAME = libtk_$(TK_MAJOR_VERSION)_$(TK_MINOR_VERSION)_$(TK_PATCH_LETTER)$(TK_RELEASE_SERIAL).zip

+!endif

+

+!if $(DOING_TCL)

 TCLSHNAME       = $(PROJECT)sh$(VERSION)$(SUFX).exe

 TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

 TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

 TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

 TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

+TCLSCRIPTZIP    = $(OUT_DIR)\$(TCLSCRIPTZIPNAME)

 

 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

@@ -1150,6 +1167,7 @@ TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib
 TCL_LIBRARY	= $(_TCLDIR)\lib

 TCLREGLIB	= $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib

 TCLDDELIB	= $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib

+TCLSCRIPTZIP	= $(_TCLDIR)\lib\$(TCLSCRIPTZIPNAME)

 TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target

 TCL_INCLUDES    = -I"$(_TCLDIR)\include"

 

@@ -1169,6 +1187,7 @@ TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib
 TCL_LIBRARY	= $(_TCLDIR)\library

 TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib

 TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib

+TCLSCRIPTZIP	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSCRIPTZIPNAME)

 TCLTOOLSDIR	= $(_TCLDIR)\tools

 TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"

 

@@ -1201,7 +1220,8 @@ WISH 		= $(OUT_DIR)\$(WISHNAME)
 TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)

 TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

-TK_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

+TK_INCLUDES     = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

+TKSCRIPTZIP     = $(OUT_DIR)\$(TKSCRIPTZIPNAME)

 

 !else # effectively NEED_TK

 

@@ -1216,7 +1236,10 @@ TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib
 TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

 !endif

 TK_INCLUDES     = -I"$(_TKDIR)\include"

+TKSCRIPTZIP     = $(_TKDIR)\lib\$(TKSCRIPTZIPNAME)

+

 !else # Building against Tk sources

+

 WISH		= $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)

 TKSTUBLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

@@ -1227,7 +1250,10 @@ TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib
 TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

 !endif

 TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"

+TKSCRIPTZIP     = $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSCRIPTZIPNAME)

+

 !endif # TKINSTALL

+

 tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"

 

 !endif # $(DOING_TK)

@@ -1616,6 +1642,8 @@ default-install-pdbs:
 	@if not exist "$(LIB_INSTALL_DIR)" mkdir "$(LIB_INSTALL_DIR)"

 	@$(CPY) "$(OUT_DIR)\*.pdb" "$(LIB_INSTALL_DIR)\"

 

+# "emacs font-lock highlighting fix

+

 default-install-docs-html:

 	@echo Installing documentation files to '$(DOC_INSTALL_DIR)'

 	@if not exist "$(DOC_INSTALL_DIR)" mkdir "$(DOC_INSTALL_DIR)"

@@ -1780,8 +1808,8 @@ $<
 TCLNMAKECONFIG = "$(_TCLDIR)\lib\nmake\tcl.nmake"

 !endif

 !else # !$(TCLINSTALL) - building against Tcl source

-!if exist("$(OUT_DIR)\tcl.nmake")

-TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"

+!if exist("$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl.nmake")

+TCLNMAKECONFIG	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl.nmake"

 !endif

 !endif # TCLINSTALL