summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-08 08:30:32 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-08 08:30:32 (GMT)
commit785f4b624986d207f4c1763b7bb807fbe82a2c1f (patch)
tree6ddc548cb99fa1fdee70390dd5ae41e2dc225cfd
parent36eb1fcc42c8ad41e070467e6e935eff105b73ab (diff)
parent7c58bae5a0957ef7a7d3301292d2385d749ccbcb (diff)
downloadtk-785f4b624986d207f4c1763b7bb807fbe82a2c1f.zip
tk-785f4b624986d207f4c1763b7bb807fbe82a2c1f.tar.gz
tk-785f4b624986d207f4c1763b7bb807fbe82a2c1f.tar.bz2
use "in" operator in stead
-rw-r--r--unix/Makefile.in2
-rw-r--r--win/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index e2f173b..b88001d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -734,7 +734,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 9ffa737..7788da9 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -480,7 +480,7 @@ install-binaries: binaries
@(\
echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} 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]";\