@@ -24,7 +24,7 @@ _RULES_VC = 1
2424# For modifications that are not backward-compatible, you *must* change
2525# the major version.
2626RULES_VERSION_MAJOR = 1
27- RULES_VERSION_MINOR = 14
27+ RULES_VERSION_MINOR = 15
2828
2929# The PROJECT macro must be defined by parent makefile.
3030!if "$(PROJECT)" == ""
@@ -881,10 +881,6 @@ USE_THREAD_ALLOC= 0
881881!message *** Build for Tcl8
882882TCL_BUILD_FOR = 8
883883!endif
884- !if [nmakehlp -f $(OPTS) "tk8"]
885- !message *** Build for Tk8
886- TK_BUILD_FOR = 8
887- !endif
888884
889885!if $(TCL_MAJOR_VERSION) == 8
890886!if [nmakehlp -f $(OPTS) "time64bit"]
@@ -1454,10 +1450,7 @@ OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
14541450!endif
14551451!endif
14561452!if "$(TCL_BUILD_FOR)" == "8"
1457- OPTDEFINES = $(OPTDEFINES ) /DTCL_MAJOR_VERSION=8
1458- !endif
1459- !if "$(TK_BUILD_FOR)" == "8"
1460- OPTDEFINES = $(OPTDEFINES ) /DTK_MAJOR_VERSION=8
1453+ OPTDEFINES = $(OPTDEFINES ) /DTCL_MAJOR_VERSION=8 /DTK_MAJOR_VERSION=8
14611454!endif
14621455
14631456# Like the TEA system only set this non empty for non-Tk extensions
@@ -1648,7 +1641,7 @@ default-target: $(DEFAULT_BUILD_TARGET)
16481641
16491642!if $(MULTIPLATFORM_INSTALL)
16501643default-pkgindex :
1651- @echo if {[package vsatisfies [package provide Tcl] 9.0- ]} { > $( OUT_DIR) \p kgIndex.tcl
1644+ @echo if {[package vsatisfies [package provide Tcl] 9.0]} { > $( OUT_DIR) \p kgIndex.tcl
16521645 @echo package ifneeded $(PRJ_PACKAGE_TCLNAME ) $(DOTVERSION ) \
16531646 [list load [file join $$ dir $( PLATFORM_IDENTIFY) $( PRJLIBNAME9) ]] >> $( OUT_DIR) \p kgIndex.tcl
16541647 @echo } else { >> $( OUT_DIR) \p kgIndex.tcl
@@ -1657,7 +1650,7 @@ default-pkgindex:
16571650 @echo } >> $(OUT_DIR ) \p kgIndex.tcl
16581651!else
16591652default-pkgindex :
1660- @echo if {[package vsatisfies [package provide Tcl] 9.0- ]} { > $( OUT_DIR) \p kgIndex.tcl
1653+ @echo if {[package vsatisfies [package provide Tcl] 9.0]} { > $( OUT_DIR) \p kgIndex.tcl
16611654 @echo package ifneeded $(PRJ_PACKAGE_TCLNAME ) $(DOTVERSION ) \
16621655 [list load [file join $$ dir $( PRJLIBNAME9) ]] >> $( OUT_DIR) \p kgIndex.tcl
16631656 @echo } else { >> $( OUT_DIR) \p kgIndex.tcl
@@ -1697,6 +1690,7 @@ default-install-libraries: default-install-scripts
16971690
16981691default-install-scripts : $(OUT_DIR ) \pkgIndex.tcl
16991692 @echo Installing libraries to ' $(SCRIPT_INSTALL_DIR)'
1693+ @if not exist " $( SCRIPT_INSTALL_DIR) " mkdir " $( SCRIPT_INSTALL_DIR) "
17001694 @if exist $(LIBDIR ) $(CPY ) $(LIBDIR ) \* .tcl " $( SCRIPT_INSTALL_DIR) "
17011695 @echo Installing package index in ' $(SCRIPT_INSTALL_DIR)'
17021696 @$(CPY ) $(OUT_DIR ) \p kgIndex.tcl $(SCRIPT_INSTALL_DIR )
0 commit comments