--- ./Makefile.orig	2010-07-28 13:03:43.000000000 -0400
+++ ./Makefile	2010-08-16 21:56:54.957322822 -0400
@@ -255,8 +255,8 @@
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
-CFLAGS = -g -O2 -Wall
-LDFLAGS =
+CFLAGS ?= -g -O2 -Wall
+LDFLAGS ?=
 ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
@@ -276,13 +276,13 @@
 prefix = $(HOME)
 bindir_relative = bin
 bindir = $(prefix)/$(bindir_relative)
-mandir = share/man
-infodir = share/info
+mandir = $(prefix)/man
+infodir = $(prefix)/info
 gitexecdir = libexec/git-core
 sharedir = $(prefix)/share
-gitwebdir = $(sharedir)/gitweb
+gitwebdir = $(sharedir)/examples/git/gitweb
 template_dir = share/git-core/templates
-htmldir = share/doc/git-doc
+htmldir = share/doc/git
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
 ETC_GITCONFIG = $(sysconfdir)/gitconfig
@@ -296,18 +296,18 @@
 
 export prefix bindir sharedir sysconfdir gitwebdir
 
-CC = gcc
-AR = ar
-RM = rm -f
-DIFF = diff
-TAR = tar
-FIND = find
-INSTALL = install
-RPMBUILD = rpmbuild
-TCL_PATH = tclsh
-TCLTK_PATH = wish
-PTHREAD_LIBS = -lpthread
-PTHREAD_CFLAGS =
+CC ?= gcc
+AR ?= ar
+RM ?= rm -f
+DIFF ?= diff
+TAR ?= tar
+FIND ?= find
+INSTALL ?= install
+RPMBUILD ?= rpmbuild
+TCL_PATH ?= tclsh
+TCLTK_PATH ?= wish
+PTHREAD_LIBS ?= -lpthread
+PTHREAD_CFLAGS ?=
 
 export TCL_PATH TCLTK_PATH
 
@@ -1232,9 +1232,9 @@
 endif
 ifndef NO_OPENSSL
 	OPENSSL_LIBSSL = -lssl
-	ifdef OPENSSLDIR
-		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
-		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
+	ifdef OPENSSLBASE
+		BASIC_CFLAGS += -I$(OPENSSLBASE)/include
+		OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib)
 	else
 		OPENSSL_LINK =
 	endif