From 16d5da888978bcf5eff6acf928afd0e62c54c293 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 11 Mar 2014 12:20:29 +0400 Subject: [PATCH] Allow to override PYTHON. --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 54e36b1a..532dad29 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ PACKAGES=database debian files http utils ALL_PACKAGES=aptly cmd console database debian files http utils BINPATH=$(abspath ./_vendor/bin) GOM_ENVIRONMENT=-test +PYTHON?=python ifeq ($(GOVERSION), devel) TRAVIS_TARGET=coveralls @@ -38,13 +39,15 @@ check: $(GOM) exec go tool vet -all=true -shadow=true $(ALL_PACKAGES:%=./%) $(GOM) exec golint $(ALL_PACKAGES:%=./%) -system-test: +install: + $(GOM) build -o $(BINPATH)/aptly + +system-test: install ifeq ($(GOVERSION),$(filter $(GOVERSION),go1.2 go1.2.1 devel)) if [ ! -e ~/aptly-fixture-db ]; then git clone https://github.com/aptly-dev/aptly-fixture-db.git ~/aptly-fixture-db/; fi endif if [ ! -e ~/aptly-fixture-pool ]; then git clone https://github.com/aptly-dev/aptly-fixture-pool.git ~/aptly-fixture-pool/; fi - $(GOM) build -o $(BINPATH)/aptly - PATH=$(BINPATH)/:$(PATH) python system/run.py --long + PATH=$(BINPATH)/:$(PATH) $(PYTHON) system/run.py --long travis: $(TRAVIS_TARGET) system-test