Re: [PATCH 1/3] git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Jul 30, 2008, 05:25 UTC
- Message-ID
- <20080730052517.GF7225@spearce.org>
- In-Reply-To
- <AF6C526A-57ED-4386-A4CF-5260D82026B7@zib.de>
Steffen Prohaska <prohaska@zib.de> wrote:
Show 14 quoted lines
> Isn't only the computation of sharedir based on gitexecdir wrong? > >> ifndef sharedir >> sharedir := $(dir $(gitexecdir))share > > and could be replaced with this (instead of your patch): > > ifndef sharedir > +ifeq (git-core,$(notdir $(gitexecdir))) > + sharedir := $(dir $(patsubst %/,%,$(dir $(gitexecdir))))share > +else > sharedir := $(dir $(gitexecdir))share > endif > +endif
Oh, damn good catch. Thanks.
How about this then? Its your patch above, my message, and me forging your SOB...
--8<-- From: Steffen Prohaska <prohaska@zib.de> Subject: 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: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile index b19fb2d..c9d67fe 100644 --- a/Makefile +++ b/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
-- 1.6.0.rc1.166.gbbfa8 -- Shawn.