summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-30 07:18:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-30 07:18:26 (GMT)
commit731ab1f55e7ba736b24708a63e93a7c8d581a4d6 (patch)
tree602f7ddda98503fda6f2d014ca322beaf79a868f /git-gui/Makefile
parentc70115b4b1a8c197b9b829b1fd15d578a3ffcdc3 (diff)
parent5fc6edab76ea16c5fad7138389c2fcc2076534e7 (diff)
downloadgit-731ab1f55e7ba736b24708a63e93a7c8d581a4d6.zip
git-731ab1f55e7ba736b24708a63e93a7c8d581a4d6.tar.gz
git-731ab1f55e7ba736b24708a63e93a7c8d581a4d6.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui (Windows): Change wrapper to execdir 'libexec/git-core' git-gui (Windows): Switch to relative discovery of oguilib git-gui: Correct installation of library to be $prefix/share git-gui: Fix gitk search in $PATH to work on Windows git-gui: Preserve scroll position on reshow_diff. git-gui: Fix the Remote menu separator.
Diffstat (limited to 'git-gui/Makefile')
-rw-r--r--git-gui/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index b19fb2d..55765c8 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -34,8 +34,12 @@ ifndef gitexecdir
endif
ifndef sharedir
+ifeq (git-core,$(notdir $(gitexecdir)))
+ sharedir := $(dir $(patsubst %/,%,$(dir $(gitexecdir))))share
+else
sharedir := $(dir $(gitexecdir))share
endif
+endif
ifndef INSTALL
INSTALL = install
@@ -156,6 +160,7 @@ endif
ifneq (,$(findstring MINGW,$(uname_S)))
NO_MSGFMT=1
GITGUI_WINDOWS_WRAPPER := YesPlease
+ GITGUI_RELATIVE := 1
endif
ifdef GITGUI_MACOSXAPP