From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Aug 2010 19:53:07 +0000 (-0700)
Subject: Merge branch 'bc/use-more-hardlinks-in-install' into maint
X-Git-Tag: v1.7.2.3~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0fd26f4830ef6bc0a45866782c2d02526ebc817b;hp=-c;p=git.git

Merge branch 'bc/use-more-hardlinks-in-install' into maint

* bc/use-more-hardlinks-in-install:
  Makefile: make hard/symbolic links for non-builtins too
  Makefile: link builtins residing in bin directory to main git binary too
---

0fd26f4830ef6bc0a45866782c2d02526ebc817b
diff --combined Makefile
index e15151653,17c91301b..1f11618cf
--- a/Makefile
+++ b/Makefile
@@@ -1854,9 -1854,8 +1854,9 @@@ builtin/prune.o builtin/reflog.o reacha
  builtin/commit.o builtin/revert.o wt-status.o: wt-status.h
  builtin/tar-tree.o archive-tar.o: tar.h
  builtin/pack-objects.o: thread-utils.h
 +connect.o transport.o http-backend.o: url.h
  http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
 -http.o http-walker.o http-push.o remote-curl.o: http.h
 +http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h
  
  xdiff-interface.o $(XDIFF_OBJS): \
  	xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
@@@ -2076,10 -2075,19 +2076,19 @@@ endi
  	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
  	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
  	{ test "$$bindir/" = "$$execdir/" || \
- 		{ $(RM) "$$execdir/git$X" && \
+ 	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
+ 		$(RM) "$$execdir/$$p" && \
  		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
- 		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
- 		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
+ 		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
+ 	  done; \
+ 	} && \
+ 	for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
+ 		$(RM) "$$bindir/$$p" && \
+ 		ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
+ 		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
+ 	done && \
  	for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
  		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
@@@ -2255,7 -2263,6 +2264,7 @@@ check-docs:
  		documented,gitglossary | \
  		documented,githooks | \
  		documented,gitrepository-layout | \
 +		documented,gitrevisions | \
  		documented,gittutorial | \
  		documented,gittutorial-2 | \
  		documented,git-bisect-lk2009 | \