diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-05 11:11:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-05 11:11:21 (GMT) |
| commit | 3bdab17aa1fd8bf152a56280e2771681af38c1e0 (patch) | |
| tree | e3143d6043d82311b6be00703e45ee0e7f8067dd /win | |
| parent | 3205fa5a3bd47720c826666603890888bd9682c5 (diff) | |
| download | tk-3bdab17aa1fd8bf152a56280e2771681af38c1e0.zip tk-3bdab17aa1fd8bf152a56280e2771681af38c1e0.tar.gz tk-3bdab17aa1fd8bf152a56280e2771681af38c1e0.tar.bz2 | |
Generate same pkgIndex.tcl file for win32 and cygwin, one that is equally useable for both
FossilOrigin-Name: 020866e926f4e4e0ce1bdba3e2bd0a8a9e97f646
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 89b61cd..6bfa4ad 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -478,8 +478,12 @@ install-binaries: binaries @$(RM) $(PKG_INDEX); @(\ echo "if {[catch {package present Tcl 8.5.0}]} { return }";\ - echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL)\ - [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ + echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\ + echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ + echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\ + echo "} else {";\ + echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ + echo "}";\ ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ do \ @@ -669,7 +673,7 @@ tkWindow.$(OBJEXT): configure Makefile .SUFFIXES: .$(RES) .SUFFIXES: .rc -# Implicit rule for all object files that will end up in the Tcl library +# Implicit rule for all object files that will end up in the Tk library %.$(OBJEXT): %.c $(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME) |