Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui

diff --git a/git-gui/macosx/AppMain.tcl b/git-gui/macosx/AppMain.tcl
index 738bdd03ed8a3940ae9bec362ddcfd16a3c48e9c..b6c6dc35003bb30a97feebcec6e3247f71f0c314 100644 (file)
--- a/git-gui/macosx/AppMain.tcl
+++ b/git-gui/macosx/AppMain.tcl
@@ -1,5 +1,10 @@
 set gitexecdir {@@gitexecdir@@}
-set gitguilib  {@@GITGUI_LIBDIR@@}
+if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
+       set gitguilib $::env(GIT_GUI_LIB_DIR)
+} else {
+       set gitguilib {@@GITGUI_LIBDIR@@}
+}
+
 set env(PATH) "$gitexecdir:$env(PATH)"
 
 if {[string first -psn [lindex $argv 0]] == 0} {