Index: Documentation/Makefile
--- Documentation/Makefile.orig	2017-02-24 20:17:39.000000000 +0100
+++ Documentation/Makefile	2017-02-25 09:52:12.308919000 +0100
@@ -117,12 +117,12 @@
 
 MAKEINFO = makeinfo
 INSTALL_INFO = install-info
-DOCBOOK2X_TEXI = docbook2x-texi
+DOCBOOK2X_TEXI = docbook2texi
 DBLATEX = dblatex
 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
 DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
 ifndef PERL_PATH
-	PERL_PATH = /usr/bin/perl
+	PERL_PATH = perl
 endif
 
 -include ../config.mak.autogen
Index: Makefile
--- Makefile.orig	2017-02-24 20:17:39.000000000 +0100
+++ Makefile	2017-02-25 09:52:12.309303000 +0100
@@ -432,12 +432,12 @@
 bindir = $(prefix)/$(bindir_relative)
 mandir = $(prefix)/share/man
 infodir = $(prefix)/share/info
-gitexecdir = libexec/git-core
+gitexecdir = libexec/git
 mergetoolsdir = $(gitexecdir)/mergetools
 sharedir = $(prefix)/share
 gitwebdir = $(sharedir)/gitweb
 localedir = $(sharedir)/locale
-template_dir = share/git-core/templates
+template_dir = share/git/templates
 htmldir = $(prefix)/share/doc/git-doc
 ETC_GITCONFIG = $(sysconfdir)/gitconfig
 ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
@@ -1097,10 +1097,10 @@
 else
 	ifdef CURLDIR
 		# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
-		BASIC_CFLAGS += -I$(CURLDIR)/include
-		CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
+ 		BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
+ 		CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
 	else
-		CURL_LIBCURL = -lcurl
+		CURL_LIBCURL = -lcurl -lssl -lcrypto
 	endif
 	ifdef NEEDS_SSL_WITH_CURL
 		CURL_LIBCURL += -lssl
@@ -2382,6 +2382,12 @@
 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 	$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/lib'
+	$(INSTALL) -m 644 $(LIB_FILE) '$(DESTDIR_SQ)$(prefix)/lib/libgit.a'
+	$(INSTALL) -m 644 $(XDIFF_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-xdiff.a'
+	$(INSTALL) -m 644 $(VCSSVN_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-vcssvn.a'
+	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/include/git'
+	for h in $(LIB_H); do b=`echo $$h | sed -e 's;/*[^/][^/]*$$;;'`; $(INSTALL) -d -m 755 $(DESTDIR_SQ)$(prefix)/include/git/$$b; $(INSTALL) -m 644 $$h $(DESTDIR_SQ)$(prefix)/include/git/$$h; done
 	$(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: builtin/grep.c
--- builtin/grep.c.orig	2017-02-25 09:52:13.055823000 +0100
+++ builtin/grep.c	2017-02-25 10:01:36.586159000 +0100
@@ -37,9 +37,6 @@
 #define GREP_NUM_THREADS_DEFAULT 8
 static int num_threads;
 
-#ifndef NO_PTHREADS
-static pthread_t *threads;
-
 /* We use one producer thread and THREADS consumer
  * threads. The producer adds struct work_items to 'todo' and the
  * consumers pick work items from the same array.
@@ -50,6 +47,9 @@
 	struct strbuf out;
 };
 
+#ifndef NO_PTHREADS
+static pthread_t *threads;
+
 /* In the range [todo_done, todo_start) in 'todo' we have work_items
  * that have been or are processed by a consumer thread. We haven't
  * written the result for these to stdout yet.
Index: config.mak.in
--- config.mak.in.orig	2017-02-24 20:17:39.000000000 +0100
+++ config.mak.in	2017-02-25 09:52:12.309676000 +0100
@@ -14,9 +14,9 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
-gitexecdir = @libexecdir@/git-core
+gitexecdir = @libexecdir@/git
 datarootdir = @datarootdir@
-template_dir = @datadir@/git-core/templates
+template_dir = @datadir@/git/templates
 sysconfdir = @sysconfdir@
 docdir = @docdir@
 
Index: perl/Makefile.PL
--- perl/Makefile.PL.orig	2017-02-24 20:17:39.000000000 +0100
+++ perl/Makefile.PL	2017-02-25 09:52:12.309787000 +0100
@@ -58,5 +58,6 @@
 	PM		=> \%pm,
 	PM_FILTER	=> qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"],
 	MAKEFILE	=> 'perl.mak',
-	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
+	INSTALLDIRS	=> 'vendor',
+	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
 );
Index: templates/Makefile
--- templates/Makefile.orig	2017-02-24 20:17:39.000000000 +0100
+++ templates/Makefile	2017-02-25 09:52:12.310331000 +0100
@@ -8,7 +8,7 @@
 TAR ?= tar
 RM ?= rm -f
 prefix ?= $(HOME)
-template_instdir ?= $(prefix)/share/git-core/templates
+template_instdir ?= $(prefix)/share/git/templates
 # DESTDIR=
 
 ifndef SHELL_PATH