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 /unix/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 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index da041ba..3c48bfb 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -729,16 +729,16 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ (\ - echo "if {[catch {package present Tcl 8.6.0}]} return";\ + echo "if {![package vsatisfies [package provide Tcl] 8.6.0]} return";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]]]";\ else \ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)]] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)]]]";\ echo "} else {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll]] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll]]]";\ echo "}";\ fi \ ) > "$(PKG_INDEX)"; \ @@ -904,8 +904,10 @@ Makefile: $(UNIX_DIR)/Makefile.in # $(SHELL) config.status clean: + rm -rf *.vfs rm -f *.a *.o libtk* core errs *~ \#* TAGS *.E a.out \ - errors ${WISH_EXE} $(TKTEST_EXE) lib.exp Tk *.rsrc + errors ${WISH_EXE} $(TKTEST_EXE) lib.exp Tk *.rsrc \ + *.zip distclean: clean rm -rf Makefile config.status config.cache config.log tkConfig.sh \ |