launchpad-reviewers team mailing list archive

[Guruprasad <mp+426193@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:update-venv-python-makefile into launchpad:master.

Commit message:
Omit the directory-part of the PYTHON in VENV_PYTHON in the Makefile

This allows the `make compile` command to work properly when run from
the Launchpad charm.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/426193
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:update-venv-python-makefile into launchpad:master.

diff --git a/Makefile b/Makefile
index 5d59a25..af03cce 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ VIRTUALENV := $(PIP_ENV) /usr/bin/virtualenv
 PIP := PYTHONPATH= $(PIP_ENV) env/bin/pip --cache-dir=$(WD)/download-cache/
 
 VENV_INSTANCE_NAME := env/instance_name
-VENV_PYTHON := env/bin/$(PYTHON)
+VENV_PYTHON := env/bin/$(notdir $(PYTHON))
 
 SITE_PACKAGES := \
 	$$($(VENV_PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')