summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-08 08:17:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-08 08:17:10 (GMT)
commita5d69ce91b44a9dca1d079330a7d7eaa29fb4805 (patch)
treec5214231958cae6ab31dd502871ced8638ce80ea /win
parent1c58b6c675335b5cdd57de967a4231943fae4dd7 (diff)
downloadtk-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
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in4
1 files changed, 2 insertions, 2 deletions
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]";\