X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Fgit-gui.sh;h=ad65aaad5a696ec355d9b965b13704f57145678f;hb=d96ca27e1089a190139591ac365873f26bffcf5c;hp=14b2d9aacd1d28084f195365b434747df2ddc95d;hpb=847d10f56d7853cd0e139a7c2e6ad0ad2de5c464;p=git.git

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 14b2d9aac..ad65aaad5 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -52,7 +52,11 @@ catch {rename send {}} ; # What an evil concept...
 set oguilib {@@GITGUI_LIBDIR@@}
 set oguirel {@@GITGUI_RELATIVE@@}
 if {$oguirel eq {1}} {
-	set oguilib [file dirname [file dirname [file normalize $argv0]]]
+	set oguilib [file dirname [file normalize $argv0]]
+	if {[file tail $oguilib] eq {git-core}} {
+		set oguilib [file dirname $oguilib]
+	}
+	set oguilib [file dirname $oguilib]
 	set oguilib [file join $oguilib share git-gui lib]
 	set oguimsg [file join $oguilib msgs]
 } elseif {[string match @@* $oguirel]} {