diff options
| author | Daniel A. Steffen <das@users.sourceforge.net> | 2008-08-16 03:20:09 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-05-01 15:04:52 -0700 |
| commit | a91be3fcbe92c24e809b1ec85881a6da40a9a340 (patch) | |
| tree | 11725e38a6e69361a04141e4e97dc5f0304da434 /Makefile | |
| parent | c736b4c83b929bdcb3fac2cc9e063258cc75cbe2 (diff) | |
| download | git-a91be3fcbe92c24e809b1ec85881a6da40a9a340.tar.gz git-a91be3fcbe92c24e809b1ec85881a6da40a9a340.tar.xz | |
git-gui: Fixes for Mac OS X TkAqua
- detect more Tk.framework variants
- fix apple menu setup, use native preferences menu item
- don't set menu font
Signed-off-by: Daniel A. Steffen <das@users.sourceforge.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 |