Skip to content

Commit f8f1acf

Browse files
sprohaskaspearce
authored andcommitted
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 <[email protected]> Signed-off-by: Shawn O. Pearce <[email protected]>
1 parent 79317e5 commit f8f1acf

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ ifndef gitexecdir
3434
endif
3535

3636
ifndef sharedir
37+
ifeq (git-core,$(notdir $(gitexecdir)))
38+
sharedir := $(dir $(patsubst %/,%,$(dir $(gitexecdir))))share
39+
else
3740
sharedir := $(dir $(gitexecdir))share
3841
endif
42+
endif
3943

4044
ifndef INSTALL
4145
INSTALL = install

0 commit comments

Comments
 (0)