|
|
|
|
@ -37,9 +37,9 @@ Index: gc-utils/doc/Makefile
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
uninstall:
|
|
|
|
|
Index: git-1.7.11.1/Documentation/Makefile
|
|
|
|
|
--- git-1.7.11.1/Documentation/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.1/Documentation/Makefile 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
Index: git-1.7.11.2/Documentation/Makefile
|
|
|
|
|
--- git-1.7.11.2/Documentation/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.2/Documentation/Makefile 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
@@ -56,10 +56,10 @@
|
|
|
|
|
infodir?=$(prefix)/share/info
|
|
|
|
|
MAKEINFO=makeinfo
|
|
|
|
|
@ -53,9 +53,9 @@ Index: git-1.7.11.1/Documentation/Makefile
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-include ../config.mak.autogen
|
|
|
|
|
Index: git-1.7.11.1/Makefile
|
|
|
|
|
--- git-1.7.11.1/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.1/Makefile 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
Index: git-1.7.11.2/Makefile
|
|
|
|
|
--- git-1.7.11.2/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.2/Makefile 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
@@ -339,12 +339,12 @@
|
|
|
|
|
bindir = $(prefix)/$(bindir_relative)
|
|
|
|
|
mandir = share/man
|
|
|
|
|
@ -98,9 +98,9 @@ Index: git-1.7.11.1/Makefile
|
|
|
|
|
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
|
|
|
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
|
|
|
|
|
$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
|
|
|
|
|
Index: git-1.7.11.1/config.mak.in
|
|
|
|
|
--- git-1.7.11.1/config.mak.in.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.1/config.mak.in 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
Index: git-1.7.11.2/config.mak.in
|
|
|
|
|
--- git-1.7.11.2/config.mak.in.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.2/config.mak.in 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
@@ -15,9 +15,9 @@
|
|
|
|
|
prefix = @prefix@
|
|
|
|
|
exec_prefix = @exec_prefix@
|
|
|
|
|
@ -113,9 +113,9 @@ Index: git-1.7.11.1/config.mak.in
|
|
|
|
|
sysconfdir = @sysconfdir@
|
|
|
|
|
|
|
|
|
|
mandir=@mandir@
|
|
|
|
|
Index: git-1.7.11.1/perl/Makefile.PL
|
|
|
|
|
--- git-1.7.11.1/perl/Makefile.PL.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.1/perl/Makefile.PL 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
Index: git-1.7.11.2/perl/Makefile.PL
|
|
|
|
|
--- git-1.7.11.2/perl/Makefile.PL.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.2/perl/Makefile.PL 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
@@ -55,5 +55,6 @@
|
|
|
|
|
PM => \%pm,
|
|
|
|
|
PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"],
|
|
|
|
|
@ -124,9 +124,9 @@ Index: git-1.7.11.1/perl/Makefile.PL
|
|
|
|
|
+ INSTALLDIRS => 'vendor',
|
|
|
|
|
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
|
|
|
|
|
);
|
|
|
|
|
Index: git-1.7.11.1/sha1_file.c
|
|
|
|
|
--- git-1.7.11.1/sha1_file.c.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.1/sha1_file.c 2012-06-18 16:32:16.000000000 +0200
|
|
|
|
|
Index: git-1.7.11.2/sha1_file.c
|
|
|
|
|
--- git-1.7.11.2/sha1_file.c.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.2/sha1_file.c 2012-06-18 16:32:16.000000000 +0200
|
|
|
|
|
@@ -20,6 +20,7 @@
|
|
|
|
|
#include "sha1-lookup.h"
|
|
|
|
|
#include "bulk-checkin.h"
|
|
|
|
|
@ -135,9 +135,9 @@ Index: git-1.7.11.1/sha1_file.c
|
|
|
|
|
|
|
|
|
|
#ifndef O_NOATIME
|
|
|
|
|
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
|
|
|
|
|
Index: git-1.7.11.1/templates/Makefile
|
|
|
|
|
--- git-1.7.11.1/templates/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.1/templates/Makefile 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
Index: git-1.7.11.2/templates/Makefile
|
|
|
|
|
--- git-1.7.11.2/templates/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
|
|
|
|
|
+++ git-1.7.11.2/templates/Makefile 2012-06-18 16:02:16.000000000 +0200
|
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
TAR ?= tar
|
|
|
|
|
RM ?= rm -f
|
|
|
|
|
|