diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2020-06-19 04:51:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 04:51:02 +0000 |
| commit | ca1c3bd15d60faf235894cb4f6f3a15150e3a6c3 (patch) | |
| tree | f951cabe1e0140ee5476c33b7703746285fa5ea0 /utils/makefile.python | |
| parent | cc721b5d864bcc0bf58d29337aaa1ec774bd70b5 (diff) | |
| parent | c83007a6bcd2a7f765e7655b91cc6714fbc4ab01 (diff) | |
Merge branch 'master' into csp-oscar-theme
Diffstat (limited to 'utils/makefile.python')
| -rw-r--r-- | utils/makefile.python | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/makefile.python b/utils/makefile.python index 590bbdb46..df16acbbf 100644 --- a/utils/makefile.python +++ b/utils/makefile.python @@ -8,9 +8,9 @@ export PYTHONPATH := $(SITE_PYTHON):$$PYTHONPATH export PY_ENV PYDIST PYBUILD # folder where the python distribution takes place -PYDIST ?= ./py_dist +PYDIST = ./$(LXC_ENV_FOLDER)dist # folder where the python intermediate build files take place -PYBUILD ?= ./py_build +PYBUILD = ./$(LXC_ENV_FOLDER)build # python version to use PY ?=3 # $(PYTHON) points to the python interpreter from the OS! The python from the @@ -30,8 +30,7 @@ PYLINT_RC ?= .pylintrc TEST_FOLDER ?= ./tests TEST ?= . -VTENV_OPTS = "--no-site-packages" -PY_ENV = ./local/py$(PY) +PY_ENV = ./$(LXC_ENV_FOLDER)local/py$(PY) PY_ENV_BIN = $(PY_ENV)/bin PY_ENV_ACT = . $(PY_ENV_BIN)/activate @@ -41,6 +40,7 @@ ifeq ($(OS),Windows_NT) PY_ENV_ACT = $(PY_ENV_BIN)/activate endif +VTENV_OPTS ?= ifeq ($(PYTHON),python) VIRTUALENV = virtualenv else |