Junio C Hamano <gitster@xxxxxxxxx> writes: > 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. What I wanted to say with the above is that the main Makefile is what has its own special need from git-gui/Makefile's point of view, so passing such customization from the main Makefile makes a lot of sense. I think this is also needed; I noticed it while trying the "build on a machine without any git installed" exercise. diff --git a/Makefile b/Makefile index 798a2f2..52c67c1 100644 --- a/Makefile +++ b/Makefile @@ -1067,7 +1067,7 @@ endif all:: ifndef NO_TCLTK - $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all + $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) gitexecdir='$(gitexec_instdir_SQ)' all $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all endif $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all -- 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