--- OLD/Makefile	Thu Jan  1 00:00:00 1970
+++ NEW/Makefile	Thu Jan  1 00:00:00 1970
@@ -8,11 +8,11 @@
 # Define SANE_TOOL_PATH to a colon-separated list of paths to prepend
 # to PATH if your tools in /usr/bin are broken.
 #
-# Define SNPRINTF_RETURNS_BOGUS if your are on a system which snprintf()
+# Define SNPRINTF_RETURNS_BOGUS if you are on a system which snprintf()
 # or vsnprintf() return -1 instead of number of characters which would
 # have been written to the final string if enough space had been available.
 #
-# Define FREAD_READS_DIRECTORIES if your are on a system which succeeds
+# Define FREAD_READS_DIRECTORIES if you are on a system which succeeds
 # when attempting to read from an fopen'ed directory.
 #
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
@@ -153,7 +153,7 @@
 # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
 # field that counts the on-disk footprint in 512-byte blocks.
 #
-# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
+# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8.
 #
 # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
 #
@@ -194,11 +194,30 @@
 # Define NO_CROSS_DIRECTORY_HARDLINKS if you plan to distribute the installed
 # programs as a tar, where bin/ and libexec/ might be on different file systems.
 #
-# Define USE_NED_ALLOCATOR if you want to replace the platforms default
+# Define USE_NED_ALLOCATOR if you want to replace the platform's default
 # memory allocators with the nedmalloc allocator written by Niall Douglas.
 #
 # Define NO_REGEX if you have no or inferior regex support in your C library.
 
+NO_OPENSSL=1
+NO_CURL=1
+NO_EXPAT=1
+NO_C99_FORMAT=1
+NO_STRCASESTR=1
+NO_MEMMEM=1
+NO_STRTOUMAX=1
+NO_STRTOULL=1
+NO_SVN_TESTS=1
+MOZILLA_SHA1=1
+NO_ICONV=1
+NO_PTHREADS=1
+NO_PERL=1
+NO_TCLTK=1
+INTERNAL_QSORT=1
+NO_DEFLATE_BOUND=1
+USE_ST_TIMESPEC=1
+NO_MKSTEMPS=1
+
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@$(SHELL_PATH) ./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
@@ -230,13 +249,13 @@
 # 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)
-bindir_relative = bin
+prefix = /SHOULD/NOT/APPEAR
+bindir_relative = /SHOULD/NOT/APPEAR
 bindir = $(prefix)/$(bindir_relative)
 mandir = share/man
 infodir = share/info
-gitexecdir = libexec/git-core
-sharedir = $(prefix)/share
+gitexecdir = $(bindir)
+sharedir = /SHOULD/NOT/APPEAR
 template_dir = share/git-core/templates
 htmldir = share/doc/git-doc
 ifeq ($(prefix),/usr)
@@ -275,7 +294,7 @@
 RM = rm -f
 TAR = tar
 FIND = find
-INSTALL = install
+INSTALL = install -c
 RPMBUILD = rpmbuild
 TCL_PATH = tclsh
 TCLTK_PATH = wish
@@ -799,16 +818,16 @@
 	BASIC_LDFLAGS += -L/usr/local/lib
 	THREADED_DELTA_SEARCH = YesPlease
 endif
-ifeq ($(uname_S),NetBSD)
-	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
-		NEEDS_LIBICONV = YesPlease
-	endif
-	BASIC_CFLAGS += -I/usr/pkg/include
-	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
-	THREADED_DELTA_SEARCH = YesPlease
-	USE_ST_TIMESPEC = YesPlease
-	NO_MKSTEMPS = YesPlease
-endif
+#ifeq ($(uname_S),NetBSD)
+#	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
+#		NEEDS_LIBICONV = YesPlease
+#	endif
+#	BASIC_CFLAGS += -I/usr/pkg/include
+#	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
+#	THREADED_DELTA_SEARCH = YesPlease
+#	USE_ST_TIMESPEC = YesPlease
+#	NO_MKSTEMPS = YesPlease
+#endif
 ifeq ($(uname_S),AIX)
 	NO_STRCASESTR=YesPlease
 	NO_MEMMEM = YesPlease