From d0073e7cb525431120e00959c9c75f47c77fcb56 Mon Sep 17 00:00:00 2001 From: Marko Mecina <marko.mecina@univie.ac.at> Date: Tue, 16 Aug 2022 15:40:31 +0200 Subject: [PATCH] detect Python venv for confignator installation --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0f2e27c..744ad5a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ all: install build-pc -install: install-python-requirements install-confignator-userspace ccs-storage codeblockreusefeature +install: install-python-requirements install-confignator ccs-storage codeblockreusefeature databases: ccs-storage codeblockreusefeature @@ -13,7 +13,7 @@ install-confignator: @echo "| installing confignator Python package |" @echo "+---------------------------------------+" $(MAKE) build -C $(CURDIR)/Tst/confignator - pip install -U $(CURDIR)/Tst/confignator/dist/*.whl + if [ -z $VIRTUAL_ENV ]; then pip install --user -U $(CURDIR)/Tst/confignator/dist/*.whl; else pip install -U $(CURDIR)/Tst/confignator/dist/*.whl; fi @echo "+--------------------------------------+" @echo "| installed confignator Python package |" @echo "+--------------------------------------+" -- GitLab