Thread (5 messages) flat view 5 messages, 3 authors, 2016-06-15

Re: [PATCH 5/9 v2] Allow the built-in exec path to be relative to the command invocation path

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:01

Possibly related (same subject, not in this thread)

Johannes Sixt [off-list ref] writes:
On Donnerstag, 24. Juli 2008, Junio C Hamano wrote:
quoted
Johannes Sixt [off-list ref] writes:
quoted
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.
quoted hunk ↗ jump to hunk
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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help