X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-gui%2FMakefile;h=b3580e9e48b6ac5d1a7fbd010f032445702f140f;hb=5e2f779cbf60997809130fde213736e1ea4f6f33;hp=3ad8a21b30128ce21b6b6c28094d9af5e5866faf;hpb=934747323c397ffe64b6dcdf2bf73128d8e36968;p=git.git

diff --git a/git-gui/Makefile b/git-gui/Makefile
index 3ad8a21b3..b3580e9e4 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -105,8 +105,11 @@ endif
 
 ifeq ($(uname_S),Darwin)
 	TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
-	ifeq ($(shell expr "$(uname_R)" : '9\.'),2)
-		TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
+	ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
+		TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
+		ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
+			TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
+		endif
 	endif
 	TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
 endif