From 334b024401edcfbc60d9a7617d02529e8ac8910b Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 8 Jul 2012 08:29:59 +0000 Subject: use "in" operator in stead FossilOrigin-Name: eb9e9f85409cda9bfdaf729a70f8f3e0c104b16b --- unix/Makefile.in | 2 +- win/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index 08192b9..7dc543d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -727,7 +727,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} 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\") && ([info exists ::env(DISPLAY)]";\ - echo " || ([info exists ::argv] && [lsearch -exact \$$::argv -display] > -1))} {";\ + echo " || ([info exists ::argv] && ("-display" in \$$::argv)))} {";\ 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 1f92ebb..46fb4dd 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -479,7 +479,7 @@ install-binaries: binaries @(\ echo "if {[catch {package present Tcl 8.5.0}]} { return }";\ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\ - echo " || ([info exists ::argv] && [lsearch -exact \$$::argv -display] > -1))} {";\ + echo " || ([info exists ::argv] && ("-display" in \$$::argv)))} {";\ 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]";\ -- cgit v0.12