--- ./Makefile.orig	2008-02-01 22:09:01.000000000 -0600
+++ ./Makefile	2008-02-03 10:55:19.000000000 -0600
@@ -150,7 +150,7 @@ uname_P := $(shell sh -c 'uname -p 2>/de
 
 # 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)
@@ -826,7 +826,7 @@ git-merge-subtree$X: git-merge-recursive
 	$(QUIET_BUILT_IN)$(RM) $@ && ln git-merge-recursive$X $@
 
 $(BUILT_INS): git$X
-	$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
+	$(QUIET_BUILT_IN)$(RM) $@ && ln -sf git$X $@
 
 common-cmds.h: ./generate-cmdlist.sh command-list.txt
 
@@ -1049,7 +1049,9 @@ remove-dashes:
 install: all
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+	for F in $(ALL_PROGRAMS) ; do \
+		$(INSTALL) $$F '$(DESTDIR_SQ)$(gitexecdir_SQ)' ; \
+	done
 	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install