From: Johannes Sixt Date: Mon, 21 Jul 2008 19:19:50 +0000 (+0200) Subject: Makefile: Do not install a copy of 'git' in $(gitexecdir) X-Git-Tag: v1.6.0-rc1~28 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c70a8d9;p=git.git Makefile: Do not install a copy of 'git' in $(gitexecdir) There is already a copy in $(bindir). A subsequent patch will enable git to derive the exec-path from its invocation path. If git is invoked recursively, the first invocation puts the exec-path into PATH, so that the recursive invocation would find the instance in the exec-path. This second instance would again try to derive an exec-path from its invocation path, but would base its result on the wrong "bindir". We do install the copy of git first, but remove it later, so that we can use it as the source of the hardlinks for the builtins. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index d0add9d8e..e6add0314 100644 --- a/Makefile +++ b/Makefile @@ -1340,6 +1340,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