diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-07-08 08:19:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-07-08 08:19:37 (GMT) |
| commit | e2422e928e42216e073e8bd6ccfec723b34372c8 (patch) | |
| tree | 3a2b5be7f844bde40f0e5c58f501e6f85974607a /unix | |
| parent | 00ad4c61287d208d680cfe35beb1a32a12a1a1fc (diff) | |
| parent | b7345103e412cb3c7f4c210d5409732a006d7cc2 (diff) | |
| download | tk-e2422e928e42216e073e8bd6ccfec723b34372c8.zip tk-e2422e928e42216e073e8bd6ccfec723b34372c8.tar.gz tk-e2422e928e42216e073e8bd6ccfec723b34372c8.tar.bz2 | |
[Bug 3532186]: pkgIndex.tcl file complexity that's unwarranted: Test for ::argv variable before trying to use it
FossilOrigin-Name: d5b8264989ea35b09f84a233b4bb6439994fe6f1
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index fbe7b97..08192b9 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -726,8 +726,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]";\ |