diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-08 08:17:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-08 08:17:10 (GMT) |
| commit | a5d69ce91b44a9dca1d079330a7d7eaa29fb4805 (patch) | |
| tree | c5214231958cae6ab31dd502871ced8638ce80ea | |
| parent | 1c58b6c675335b5cdd57de967a4231943fae4dd7 (diff) | |
| download | tk-a5d69ce91b44a9dca1d079330a7d7eaa29fb4805.zip tk-a5d69ce91b44a9dca1d079330a7d7eaa29fb4805.tar.gz tk-a5d69ce91b44a9dca1d079330a7d7eaa29fb4805.tar.bz2 | |
[Bug 3532186]: pkgIndex.tcl file complexity that's unwarranted: Test for ::argv variable before trying to use it
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 8388f1f..637f6f4 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -666,8 +666,8 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) ${WISH 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 "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ + echo " || ([info exists ::argv] && [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]";\ diff --git a/win/Makefile.in b/win/Makefile.in index 871f0af..19670c7 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -435,8 +435,8 @@ install-binaries: binaries @$(RM) $(PKG_INDEX); @(\ echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\ - echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\ - echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ + echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ + echo " || ([info exists ::argv] && [lsearch -exact \$$::argv -display] > -1))} {";\ echo " package ifneeded Tk $(VERSION) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\ echo "} else {";\ echo " package ifneeded Tk $(VERSION) [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ |