Re: [PATCH 1/9] Makefile: Do not install a copy of 'git' in $(gitexecdir)

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 1/9] Makefile: Do not install a copy of 'git' in $(gitexecdir)

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

A Large Angry SCM [off-list ref] writes:
Johannes Sixt wrote:
[...]
quoted
diff --git a/Makefile b/Makefile
index 551bde9..cbab4f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1335,6 +1335,7 @@ endif
 			'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
 	fi
 	$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+	$(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'
 ifneq (,$X)
 	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
 endif
This new action needs to be in a conditional to keep it from removing
the ONLY git executable when bindir and execdir are the same dir.
Heh, I love bug reports that come immediately after I tag the tip of
'master' as -rc1.

Re: [PATCH 1/9] Makefile: Do not install a copy of 'git' in $(gitexecdir)

From: A Large Angry SCM <hidden>
Date: 2016-06-15 22:45:03

Junio C Hamano wrote:
A Large Angry SCM [off-list ref] writes:
quoted
Johannes Sixt wrote:
[...]
quoted
diff --git a/Makefile b/Makefile
index 551bde9..cbab4f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1335,6 +1335,7 @@ endif
 			'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
 	fi
 	$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+	$(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'
 ifneq (,$X)
 	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
 endif
This new action needs to be in a conditional to keep it from removing
the ONLY git executable when bindir and execdir are the same dir.
Heh, I love bug reports that come immediately after I tag the tip of
'master' as -rc1.
Well, I'm currently about a week behind on all things git so this is as 
timely as I could make it. ;-)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help