patch-Makefile 1.2 KB

1234567891011121314151617181920212223242526272829303132333435
  1. --- git-1.6.4.2.orig/Makefile 2009-08-29 23:58:52.000000000 +0200
  2. +++ git-1.6.4.2/Makefile 2009-10-01 15:36:20.567802008 +0200
  3. @@ -212,8 +212,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
  4. # CFLAGS and LDFLAGS are for the users to override from the command line.
  5. -CFLAGS = -g -O2 -Wall
  6. -LDFLAGS =
  7. +CFLAGS ?= -g -O2 -Wall
  8. +LDFLAGS ?=
  9. ALL_CFLAGS = $(CFLAGS)
  10. ALL_LDFLAGS = $(LDFLAGS)
  11. STRIP ?= strip
  12. @@ -1345,8 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
  13. $(BUILT_INS): git$X
  14. $(QUIET_BUILT_IN)$(RM) $@ && \
  15. - ln git$X $@ 2>/dev/null || \
  16. - ln -s git$X $@ 2>/dev/null || \
  17. cp git$X $@
  18. common-cmds.h: ./generate-cmdlist.sh command-list.txt
  19. @@ -1663,12 +1661,9 @@ endif
  20. { test "$$bindir/" = "$$execdir/" || \
  21. { $(RM) "$$execdir/git$X" && \
  22. test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
  23. - ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
  24. cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
  25. { for p in $(BUILT_INS); do \
  26. $(RM) "$$execdir/$$p" && \
  27. - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
  28. - ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  29. cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  30. done; } && \
  31. ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"