patch-Makefile 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. --- git-1.6.5.5.orig/Makefile 2009-12-06 04:51:25.000000000 +0100
  2. +++ git-1.6.5.5/Makefile 2009-12-07 20:13:40.753866786 +0100
  3. @@ -218,8 +218,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. @@ -241,7 +241,7 @@ bindir_relative = bin
  13. bindir = $(prefix)/$(bindir_relative)
  14. mandir = share/man
  15. infodir = share/info
  16. -gitexecdir = libexec/git-core
  17. +gitexecdir = sbin/git-core
  18. sharedir = $(prefix)/share
  19. template_dir = share/git-core/templates
  20. htmldir = share/doc/git-doc
  21. @@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
  22. $(BUILT_INS): git$X
  23. $(QUIET_BUILT_IN)$(RM) $@ && \
  24. - ln git$X $@ 2>/dev/null || \
  25. ln -s git$X $@ 2>/dev/null || \
  26. cp git$X $@
  27. @@ -1749,7 +1748,6 @@ endif
  28. cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
  29. { for p in $(BUILT_INS); do \
  30. $(RM) "$$execdir/$$p" && \
  31. - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
  32. ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  33. cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  34. done; } && \