summaryrefslogtreecommitdiffstats
path: root/unix
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)
commitd0a3f3b5288cf9564bade2efdf74599e1ac24a1b (patch)
treec5214231958cae6ab31dd502871ced8638ce80ea /unix
parentae8760d2c2d951d18039a14e617220ad642b4764 (diff)
downloadtk-d0a3f3b5288cf9564bade2efdf74599e1ac24a1b.zip
tk-d0a3f3b5288cf9564bade2efdf74599e1ac24a1b.tar.gz
tk-d0a3f3b5288cf9564bade2efdf74599e1ac24a1b.tar.bz2
[Bug 3532186]: pkgIndex.tcl file complexity that's unwarranted: Test for ::argv variable before trying to use it
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in4
1 files changed, 2 insertions, 2 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]";\