Re: [PATCH 1/3] git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Jul 27, 2008, 21:24 UTC
- Message-ID
- <20080727212405.GA10075@spearce.org>
- In-Reply-To
- <1217177383-25272-2-git-send-email-prohaska@zib.de>
Steffen Prohaska <prohaska@zib.de> wrote:
> The new execdir has is two levels below the root directory, while > the old execdir 'bin' was only one level below. This commit > adapts the discovery of oguilib that uses relative paths > accordingly.
...
Show 13 quoted lines
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index 940677c..baccd57 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -52,7 +52,9 @@ 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 dirname \
> + [file dirname [file normalize $argv0]]]]
> set oguilib [file join $oguilib share git-gui lib]Hmmph. This actually comes up incorrectly on my system. The issue appears to be `git --exec-path` gives me $prefix/libexec/git-core, and git-gui installs its library into $prefix/libexec/share, which is wrong. It should have gone to $prefix/share.
I wonder if this is better. Your other two patches seem fine.
--8<-- [PATCH] git-gui: Correct installation of library to be $prefix/share
We always wanted the library for git-gui to install into the $prefix/share directory, not $prefix/libexec/share. All of the files in our library are platform independent and may be reused across systems, like any other content stored in the share directory.
Our computation of where our library should install to was broken when git itself started installing to $prefix/libexec/git-core, which was one level down from where we expected it to be.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile index b19fb2d..f72ab6c 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,9 @@ endif ifndef gitexecdir gitexecdir := $(shell git --exec-path) endif +ifeq (git-core,$(notdir $(gitexecdir))) + gitexecdir := $(patsubst %/,%,$(dir $(gitexecdir))) +endif ifndef sharedir sharedir := $(dir $(gitexecdir))share
-- 1.6.0.rc0.182.gb96c7 -- Shawn.