Sync with GIT 1.5.3.3

diff --git a/t/Makefile b/t/Makefile
index b25caca887103d81d406d2e8696e28e598ec8f7b..72d7884232fbb4ce04082a778f9f952395764bf6 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -6,6 +6,7 @@
 #GIT_TEST_OPTS=--verbose --debug
 SHELL_PATH ?= $(SHELL)
 TAR ?= $(TAR)
+RM ?= rm -f
 
 # Shell quote;
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -19,7 +20,7 @@ $(T):
        @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
 
 clean:
-       rm -fr trash
+       $(RM) -r trash
 
 # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
 full-svn-test: