diff options
Diffstat (limited to 'devel/git/files/patch-Makefile')
| -rw-r--r-- | devel/git/files/patch-Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile index 6cf158d33aaf..9d8c27b319ce 100644 --- a/devel/git/files/patch-Makefile +++ b/devel/git/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2010-09-18 19:43:54.000000000 -0400 -+++ Makefile 2010-09-26 16:22:51.939180025 -0400 -@@ -257,8 +257,8 @@ +--- ./Makefile.orig 2011-05-04 21:16:14.000000000 -0400 ++++ ./Makefile 2011-05-06 09:53:40.669035774 -0400 +@@ -262,8 +262,8 @@ # CFLAGS and LDFLAGS are for the users to override from the command line. @@ -11,7 +11,7 @@ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) STRIP ?= strip -@@ -278,13 +278,13 @@ +@@ -284,13 +284,13 @@ prefix = $(HOME) bindir_relative = bin bindir = $(prefix)/$(bindir_relative) @@ -29,7 +29,7 @@ ifeq ($(prefix),/usr) sysconfdir = /etc ETC_GITCONFIG = $(sysconfdir)/gitconfig -@@ -298,19 +298,19 @@ +@@ -306,20 +306,20 @@ export prefix bindir sharedir sysconfdir gitwebdir @@ -43,6 +43,7 @@ -RPMBUILD = rpmbuild -TCL_PATH = tclsh -TCLTK_PATH = wish +-XGETTEXT = xgettext -PTHREAD_LIBS = -lpthread -PTHREAD_CFLAGS = -GCOV = gcov @@ -56,14 +57,15 @@ +RPMBUILD ?= rpmbuild +TCL_PATH ?= tclsh +TCLTK_PATH ?= wish ++XGETTEXT ?= xgettext +PTHREAD_LIBS ?= -lpthread +PTHREAD_CFLAGS ?= +GCOV ?= gcov export TCL_PATH TCLTK_PATH -@@ -1245,9 +1245,9 @@ - endif +@@ -1290,9 +1290,9 @@ + ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl - ifdef OPENSSLDIR |