diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-06 08:16:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-06 08:16:36 (GMT) |
| commit | 9b332879453a68b48ddb87b8ccbcbc20f11cf40c (patch) | |
| tree | a409e7b63586fe575bcbdaee8f91824d672d1d25 /unix | |
| parent | 3bdab17aa1fd8bf152a56280e2771681af38c1e0 (diff) | |
| download | tk-9b332879453a68b48ddb87b8ccbcbc20f11cf40c.zip tk-9b332879453a68b48ddb87b8ccbcbc20f11cf40c.tar.gz tk-9b332879453a68b48ddb87b8ccbcbc20f11cf40c.tar.bz2 | |
[Bug 3532186] pkgIndex.tcl file complexity
FossilOrigin-Name: 9aeb0cefdf9470ac2d00008ab9919db20cf44abc
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 406eeac..9d4646a 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -719,15 +719,16 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} (\ 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 "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 " }";\ + if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + else \ + echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\ + echo " && ([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)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ echo "}";\ + fi \ ) > "$(PKG_INDEX)"; \ fi @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" |