aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2008-07-21 21:19:50 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-25 17:41:12 -0700
commitc70a8d98a528f29bc6d6de7744e1eedd24f2a63d (patch)
treee668eee9f171e526677d3a79cd058a471bddf98e /Makefile
parent819b2b58246a7927376930e266b4ef8b43096115 (diff)
downloadgit-c70a8d98a528f29bc6d6de7744e1eedd24f2a63d.tar.gz
git-c70a8d98a528f29bc6d6de7744e1eedd24f2a63d.tar.xz
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 <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
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