--- Makefile.orig	Thu Dec 25 06:33:25 2008
+++ Makefile	Sat Jan 24 15:30:26 2009
@@ -170,7 +170,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
-CFLAGS = -g -O2 -Wall
+CFLAGS ?= -g -O2 -Wall
 LDFLAGS =
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
@@ -186,11 +186,11 @@ STRIP ?= strip
 # runtime figures out where they are based on the path to the executable.
 # This can help installing the suite in a relocatable way.
 
-prefix = $(HOME)
+#prefix = $(HOME)
 bindir = $(prefix)/bin
-mandir = $(prefix)/share/man
+mandir = $(prefix)/man
 infodir = $(prefix)/share/info
-gitexecdir = $(prefix)/libexec/git-core
+gitexecdir = $(prefix)/libexec/git
 sharedir = $(prefix)/share
 template_dir = $(sharedir)/git-core/templates
 htmldir=$(sharedir)/doc/git-doc
@@ -200,7 +200,7 @@ else
 sysconfdir = $(prefix)/etc
 endif
 lib = lib
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
 # DESTDIR=
 
 # default configuration for gitweb
@@ -223,16 +223,16 @@ GITWEB_SITE_FOOTER =
 
 export prefix bindir sharedir htmldir sysconfdir
 
-CC = gcc
+CC ?= gcc
 AR = ar
 RM = rm -f
 TAR = tar
 FIND = find
 INSTALL = install
 RPMBUILD = rpmbuild
-TCL_PATH = tclsh
-TCLTK_PATH = wish
-PTHREAD_LIBS = -lpthread
+TCL_PATH ?= tclsh
+TCLTK_PATH ?= wish
+PTHREAD_LIBS = -pthread
 
 export TCL_PATH TCLTK_PATH
 
@@ -703,11 +703,10 @@ ifeq ($(uname_S),FreeBSD)
 	endif
 endif
 ifeq ($(uname_S),OpenBSD)
-	NO_STRCASESTR = YesPlease
 	NO_MEMMEM = YesPlease
 	NEEDS_LIBICONV = YesPlease
-	BASIC_CFLAGS += -I/usr/local/include
-	BASIC_LDFLAGS += -L/usr/local/lib
+	BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
+	BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
 	THREADED_DELTA_SEARCH = YesPlease
 endif
 ifeq ($(uname_S),NetBSD)
@@ -793,7 +792,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
 	EXTLIBS += -lws2_32
 	X = .exe
-	gitexecdir = ../libexec/git-core
+	gitexecdir = ../libexec/git
 	template_dir = ../share/git-core/templates/
 	ETC_GITCONFIG = ../etc/gitconfig
 endif
@@ -864,7 +863,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
 	PROGRAMS += git-imap-send$X
 endif
 ifndef NO_OPENSSL
-	OPENSSL_LIBSSL = -lssl
+	OPENSSL_LIBSSL = -lssl -lcrypto
 	ifdef OPENSSLDIR
 		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
 		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -1363,7 +1362,7 @@ all:: $(TEST_PROGRAMS)
 
 export NO_SVN_TESTS
 
-test: all
+test:
 	$(MAKE) -C t/ all
 
 test-date$X: date.o ctype.o