|
@@ -1,6 +1,6 @@
|
|
|
---- git-1.6.4.2.orig/Makefile 2009-08-29 23:58:52.000000000 +0200
|
|
|
-+++ git-1.6.4.2/Makefile 2009-10-01 15:36:20.567802008 +0200
|
|
|
-@@ -212,8 +212,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
|
|
|
+--- git-1.6.5.5.orig/Makefile 2009-12-06 04:51:25.000000000 +0100
|
|
|
++++ git-1.6.5.5/Makefile 2009-12-07 20:13:40.753866786 +0100
|
|
|
+@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
|
|
|
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
|
|
|
|
@@ -11,25 +11,28 @@
|
|
|
ALL_CFLAGS = $(CFLAGS)
|
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
|
|
STRIP ?= strip
|
|
|
-@@ -1345,8 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
|
|
|
+@@ -241,7 +241,7 @@ bindir_relative = bin
|
|
|
+ bindir = $(prefix)/$(bindir_relative)
|
|
|
+ mandir = share/man
|
|
|
+ infodir = share/info
|
|
|
+-gitexecdir = libexec/git-core
|
|
|
++gitexecdir = sbin/git-core
|
|
|
+ sharedir = $(prefix)/share
|
|
|
+ template_dir = share/git-core/templates
|
|
|
+ htmldir = share/doc/git-doc
|
|
|
+@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
|
|
|
|
|
|
$(BUILT_INS): git$X
|
|
|
$(QUIET_BUILT_IN)$(RM) $@ && \
|
|
|
- ln git$X $@ 2>/dev/null || \
|
|
|
-- ln -s git$X $@ 2>/dev/null || \
|
|
|
+ ln -s git$X $@ 2>/dev/null || \
|
|
|
cp git$X $@
|
|
|
|
|
|
- common-cmds.h: ./generate-cmdlist.sh command-list.txt
|
|
|
-@@ -1663,12 +1661,9 @@ endif
|
|
|
- { test "$$bindir/" = "$$execdir/" || \
|
|
|
- { $(RM) "$$execdir/git$X" && \
|
|
|
- test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
|
|
|
-- ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
|
|
|
+@@ -1749,7 +1748,6 @@ endif
|
|
|
cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
|
|
|
{ for p in $(BUILT_INS); do \
|
|
|
$(RM) "$$execdir/$$p" && \
|
|
|
- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
|
|
|
-- ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
|
|
|
+ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
|
|
|
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
|
|
|
done; } && \
|
|
|
- ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
|