Merge pull request #485 from evandroforks/allow_to_define_python_bin

Allow to define python bin
This commit is contained in:
Damien Elmes 2020-03-03 18:32:55 +10:00 committed by GitHub
commit 20ce1eca96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions

View File

@ -1,11 +1,21 @@
SHELL := /bin/bash
ifeq ($(OS),Windows_NT)
PYTHON_BIN := python
ACTIVATE_SCRIPT := pyenv/Scripts/activate
ifndef ACTIVATE_SCRIPT
ACTIVATE_SCRIPT := pyenv/Scripts/activate
endif
ifndef PYTHON_BIN
PYTHON_BIN := python
endif
else
PYTHON_BIN := python3
ACTIVATE_SCRIPT := pyenv/bin/activate
ifndef ACTIVATE_SCRIPT
ACTIVATE_SCRIPT := pyenv/bin/activate
endif
ifndef PYTHON_BIN
PYTHON_BIN := python3
endif
endif
ifndef ANKI_EXTRA_PIP

View File

@ -2,9 +2,13 @@ SHELL := /bin/bash
FIND := $(if $(wildcard /bin/find),/bin/find,/usr/bin/find)
ifeq ($(OS),Windows_NT)
PYTHON_BIN := python
ifndef PYTHON_BIN
PYTHON_BIN := python
endif
else
PYTHON_BIN := python3
ifndef PYTHON_BIN
PYTHON_BIN := python3
endif
endif
.SHELLFLAGS := -eu -o pipefail -c