diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-17 21:12:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-17 21:12:16 (GMT) |
| commit | 15bcec02d97d8789fa796cabdc76859618f22387 (patch) | |
| tree | f8e09700b1a0d03ed6521a926aaabe45b2af1771 /unix | |
| parent | 03ceba547a22b69f50f302e737f783597d7f9276 (diff) | |
| download | tk-15bcec02d97d8789fa796cabdc76859618f22387.zip tk-15bcec02d97d8789fa796cabdc76859618f22387.tar.gz tk-15bcec02d97d8789fa796cabdc76859618f22387.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 27bbb19..b43c1ef 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -632,8 +632,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish (\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\ - [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) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ + echo " } else {";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [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) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "}";\ ) > $(PKG_INDEX); \ fi @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" |