summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-08 08:20:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-08 08:20:39 (GMT)
commit36eb1fcc42c8ad41e070467e6e935eff105b73ab (patch)
tree2c6c0f75e05577014a9bd494397165f9dab61633
parent6ff6b35b69e226ae44fae4bf767c4f35e1a80bdd (diff)
parentfd30222557d14ec07608457f8dbd41a6b2e2b0d8 (diff)
downloadtk-36eb1fcc42c8ad41e070467e6e935eff105b73ab.zip
tk-36eb1fcc42c8ad41e070467e6e935eff105b73ab.tar.gz
tk-36eb1fcc42c8ad41e070467e6e935eff105b73ab.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.in4
-rw-r--r--win/Makefile.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 8d5d8c7..e2f173b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -733,8 +733,8 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [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)$(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]";\
diff --git a/win/Makefile.in b/win/Makefile.in
index 807be9c..9ffa737 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -479,8 +479,8 @@ install-binaries: binaries
@$(RM) $(PKG_INDEX);
@(\
echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} 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)$(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]";\