Deal with $(bindir) and friends with whitespaces.

[git.git] / t / Makefile

diff --git a/t/Makefile b/t/Makefile
index 198c5ed..5c76aff 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -2,14 +2,22 @@
 #
 # Copyright (c) 2005 Junio C Hamano
 #
-#OPTS=--verbose --debug
-OPTS=
+
+#GIT_TEST_OPTS=--verbose --debug
+SHELL_PATH ?= $(SHELL)
+TAR ?= $(TAR)
+
+# Shell quote;
+# Result of this needs to be placed inside ''
+shq = $(subst ','\'',$(1))
+# This has surrounding ''
+shellquote = '$(call shq,$(1))'
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
-all::
-       @$(foreach t,$T,echo "*** $t ***"; sh $t $(OPTS) || exit; )
-       rm -fr trash
+all:
+       @$(foreach t,$T,echo "*** $t ***"; $(call shellquote,$(SHELL_PATH)) $t $(GIT_TEST_OPTS) || exit; )
+       @rm -fr trash
 
-clean::
+clean:
        rm -fr trash