From: Ævar Arnfjörð Bjarmason Date: Sun, 08 Aug 2010 14:49:26 GMT Subject: [PATCH v2 3/4] t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh Message-ID: <1281278967-31376-4-git-send-email-avarab@gmail.com> In-Reply-To: <1281278967-31376-1-git-send-email-avarab@gmail.com> Change the smoke testing portion of t/Makefile not to include GIT-BUILD-OPTIONS. It's a shellscript, not a Makefile snippet, so it had the nasty side-effect of sneaking e.g. SHELL_PATH = '/bin/sh' (with quotes) everywhere. Just add our own PERL_PATH variable as a workaround. The t/Makefile already has e.g. an equivalent SHELL_PATH and TAR option which duplicate the definitions in GIT-BUILD-OPTIONS. Reported-by: Thomas Rast Signed-off-by: Ævar Arnfjörð Bjarmason --- t/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/Makefile b/t/Makefile index d8bf05f..00f6482 100644 --- a/t/Makefile +++ b/t/Makefile @@ -8,6 +8,7 @@ #GIT_TEST_OPTS=--verbose --debug SHELL_PATH ?= $(SHELL) +PERL_PATH ?= /usr/bin/perl TAR ?= $(TAR) RM ?= rm -f @@ -50,7 +51,6 @@ valgrind: GIT_TEST_OPTS=--valgrind $(MAKE) # Smoke testing targets --include ../GIT-BUILD-OPTIONS -include ../GIT-VERSION-FILE uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo unknown') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo unknown') -- 1.7.1