diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-18 04:40:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-18 04:40:23 (GMT) |
| commit | 9517b261f6fbdfd580edb5b4846084051c43261c (patch) | |
| tree | 75f9dac1d1c548a2f8d94df59bd370eab406178a /unix | |
| parent | 1b47e77e7e06f634d2c9d7014d344d3de110ba7c (diff) | |
| parent | 15bcec02d97d8789fa796cabdc76859618f22387 (diff) | |
| download | tk-9517b261f6fbdfd580edb5b4846084051c43261c.zip tk-9517b261f6fbdfd580edb5b4846084051c43261c.tar.gz tk-9517b261f6fbdfd580edb5b4846084051c43261c.tar.bz2 | |
make loading of tk.dll in cygwin possible
reduce command table size
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 0096d27..ed5474d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -716,8 +716,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish@EXEEXT@ (\ echo "if {[catch {package present Tcl 8.5.0}]} { return }";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ - [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "if {[string match CYGWIN* \$$::tcl_platform(os)]} {";\ + echo " if {([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ + echo " } else {";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ + echo " }";\ + echo "} else {";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "}";\ ) > "$(PKG_INDEX)"; \ fi @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" |