diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-08 13:26:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-08 13:26:56 (GMT) |
| commit | d8bd2f13a8ee4d74b41ebca46161459831c63c19 (patch) | |
| tree | 160fff88ea6cc4bc2053ebe954f260b4a235d8c8 /win/Makefile.in | |
| parent | f601462a265af11555cb8271814eb886eb4f0492 (diff) | |
| parent | ad8867047b3dbf97070106075b402f749cb73e81 (diff) | |
| download | tk-d8bd2f13a8ee4d74b41ebca46161459831c63c19.zip tk-d8bd2f13a8ee4d74b41ebca46161459831c63c19.tar.gz tk-d8bd2f13a8ee4d74b41ebca46161459831c63c19.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index e42de9f..a60961e 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -484,12 +484,12 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {[catch {package present Tcl 8.6.0}]} return";\ + echo "if {![package vsatisfies [package provide Tcl] 8.6.0]} return";\ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ - echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]] Tk]";\ + echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]]]";\ echo "} else {";\ - echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]] Tk]";\ + echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]]]";\ echo "}";\ ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ @@ -716,7 +716,8 @@ cleanhelp: clean: cleanhelp $(RM) *.lib *.a *.exp *.dll *.res *.${OBJEXT} *~ \#* TAGS a.out $(RM) $(WISH) $(TKTEST) $(CAT32) - $(RM) *.pch *.ilk *.pdb + $(RM) *.pch *.ilk *.pdb *.zip + $(RMDIR) *.vfs distclean: clean $(RM) Makefile config.status config.cache config.log tkConfig.sh \ |