Johannes Sixt <johannes.sixt@xxxxxxxxxx> writes: > On Donnerstag, 24. Juli 2008, Junio C Hamano wrote: >> Johannes Sixt <johannes.sixt@xxxxxxxxxx> writes: >> > It also fixes 'make install' of git-gui as well (sigh!) by not exporting >> > gitexecdir - assuming that Shawn applies the git-gui patch. >> >> Yeah, this seems to break the install quite badly without git-gui patch. > > If you squash this in, we don't need the git-gui patch. Thanks. I think this patch makes _more_ sense than the git-gui patch, actually. Within the context of git.git project, we would want to force the installation directory of git-gui portion to be consistent with the main project. > diff --git a/Makefile b/Makefile > index aab23a2..904150e 100644 > --- a/Makefile > +++ b/Makefile > @@ -1344,7 +1344,7 @@ install: all > $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install > ifndef NO_TCLTK > $(MAKE) -C gitk-git install > - $(MAKE) -C git-gui install > + $(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install > endif > ifneq (,$X) > $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), > $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';) However, I have to wonder if it is the right thing to do, like your patch does, for "git --exec-path" to return "../libexec/git-core/" in a relative form, without saying what it is relative to. Shouldn't we be showing the full path after resolving that relative path to git executable? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
