From b279209b2ba64a97604cbf04ac1ecc5d56ee958b Mon Sep 17 00:00:00 2001
From: Sven Sager <akira@narux.de>
Date: Tue, 29 Aug 2023 09:43:32 +0200
Subject: [PATCH] build: Add environment variable to set alternative venv path

Signed-off-by: Sven Sager <akira@narux.de>
---
 .idea/misc.xml        |  2 +-
 .idea/revpimodio2.iml |  2 +-
 Makefile              | 25 ++++++++++++++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3ea7bd2..2a9ab31 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (revpimodio2)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (revpimodio2)" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
     <option name="version" value="3" />
   </component>
diff --git a/.idea/revpimodio2.iml b/.idea/revpimodio2.iml
index d47a4ef..0e639dc 100644
--- a/.idea/revpimodio2.iml
+++ b/.idea/revpimodio2.iml
@@ -5,7 +5,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.9 (revpimodio2)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.11 (revpimodio2)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PackageRequirementsSettings">
diff --git a/Makefile b/Makefile
index 04f00e3..bfd58eb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,34 @@ MAKEFLAGS     = --no-print-directory --no-builtin-rules
 # Variables
 PACKAGE = revpimodio2
 
-# 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 docs
 
 .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:
@@ -41,6 +52,6 @@ clean:
 	rm -rf build docs/_build dist src/*.egg-info *.spec
 
 clean-all: clean
-	rm -R venv
+	rm -R $(VENV_PATH)
 
 .PHONY: clean clean-all