diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8c91e35..a4920b4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/.idea/revpipyload.iml b/.idea/revpipyload.iml
index e32621b..9d47fbc 100644
--- a/.idea/revpipyload.iml
+++ b/.idea/revpipyload.iml
@@ -5,7 +5,7 @@
-
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 029a1a8..2e1637c 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,6 +3,8 @@
+
+
diff --git a/Makefile b/Makefile
index 25345b1..be32e00 100644
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,34 @@ MAKEFLAGS = --no-print-directory --no-builtin-rules
# Variables
PACKAGE = revpipyload
-# If virtualenv exists, use it. If not, use PATH to find, except python3
-SYSTEM_PYTHON = /usr/bin/python3
-PYTHON = $(or $(wildcard venv/bin/python), $(SYSTEM_PYTHON))
+# Set path to create the virtual environment with package name
+ifdef PYTHON3_VENV
+VENV_PATH = $(PYTHON3_VENV)/$(PACKAGE)
+else
+VENV_PATH = venv
+endif
+
+# If virtualenv exists, use it. If not, use PATH to find commands
+SYSTEM_PYTHON = python3
+PYTHON = $(or $(wildcard $(VENV_PATH)/bin/python), $(SYSTEM_PYTHON))
all: build
.PHONY: all
## Environment
+venv-info:
+ echo Using path: "$(VENV_PATH)"
+ exit 0
+
venv:
- $(SYSTEM_PYTHON) -m venv venv
- source venv/bin/activate && \
+ $(SYSTEM_PYTHON) -m venv "$(VENV_PATH)"
+ source $(VENV_PATH)/bin/activate && \
python3 -m pip install --upgrade pip && \
python3 -m pip install -r requirements.txt
exit 0
-.PHONY: venv
+.PHONY: venv-info venv
## Build, install
build:
@@ -38,6 +49,6 @@ clean:
rm -rf build dist src/*.egg-info *.spec
clean-all: clean
- rm -R venv
+ rm -R $(VENV_PATH)
.PHONY: clean clean-all