patch-Makefile 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. --- git-1.7.3.2.orig/Makefile 2010-10-22 05:49:16.000000000 +0200
  2. +++ git-1.7.3.2/Makefile 2010-11-23 23:14:56.960685586 +0100
  3. @@ -1615,9 +1615,7 @@ builtin/help.s builtin/help.o: EXTRA_CPP
  4. $(BUILT_INS): git$X
  5. $(QUIET_BUILT_IN)$(RM) $@ && \
  6. - ln git$X $@ 2>/dev/null || \
  7. - ln -s git$X $@ 2>/dev/null || \
  8. - cp git$X $@
  9. + ln -s git$X $@ 2>/dev/null
  10. common-cmds.h: ./generate-cmdlist.sh command-list.txt
  11. @@ -1932,9 +1930,7 @@ git-http-push$X: revision.o http.o http-
  12. $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
  13. $(QUIET_LNCP)$(RM) $@ && \
  14. - ln $< $@ 2>/dev/null || \
  15. - ln -s $< $@ 2>/dev/null || \
  16. - cp $< $@
  17. + ln -s $< $@ 2>/dev/null
  18. $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS)
  19. $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  20. @@ -2123,29 +2119,21 @@ endif
  21. { test "$$bindir/" = "$$execdir/" || \
  22. for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
  23. $(RM) "$$execdir/$$p" && \
  24. - test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
  25. - ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
  26. cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
  27. done; \
  28. } && \
  29. for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
  30. $(RM) "$$bindir/$$p" && \
  31. - ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
  32. - ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
  33. - cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
  34. + ln -s "git$X" "$$bindir/$$p" 2>/dev/null || exit; \
  35. done && \
  36. for p in $(BUILT_INS); do \
  37. $(RM) "$$execdir/$$p" && \
  38. - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
  39. - ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  40. - cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  41. + ln -s "git$X" "$$execdir/$$p" 2>/dev/null || exit; \
  42. done && \
  43. remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
  44. for p in $$remote_curl_aliases; do \
  45. $(RM) "$$execdir/$$p" && \
  46. - ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  47. - ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  48. - cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
  49. + ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || exit; \
  50. done && \
  51. ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"