From 904b46d1b2633371e98404f5addce59fb5f1bd46 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Wed, 6 Jan 2021 18:29:42 +0800
Subject: [PATCH] Don't rely on pip user installations to be in the PATH
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because why would they…
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c9867dae65..453ca6c803 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,9 @@
 .SUFFIXES:
 
 VIRTUALENV_VERSION = 16.0.0
-VENV_BIN = ./.virtualenv.py
+VENV_BIN = .virtualenv.py
 VENV_VERSION = 20.2.2
+PY_VERSION = 3.8
 
 VENV_DIR := .pyenv-$(shell uname)
 PYTHON_BIN := $(VENV_DIR)/bin/python
@@ -63,11 +64,11 @@ $(PREPROC): $(PREPROC_DIR)/src/main.rs
 	cd "$(PREPROC_DIR)" && cargo build --release 
 
 $(VENV_BIN):
-	python3 -m pip install virtualenv==$(VENV_VERSION) || python3 -m pip install --user virtualenv==$(VENV_VERSION)
-	ln -s `which virtualenv` $@
+	python3 -m pip install --user virtualenv==$(VENV_VERSION)
+	ln -s `pip show virtualenv | grep lib/python | cut -d ' ' -f 2 | sed 's#/lib/python/site-packages##'`/bin/virtualenv $@
 
 $(PYTHON_BIN): $(VENV_BIN) requirements.txt
-	$(VENV_BIN) -p python3.8 $(VENV_DIR)
+	./$(VENV_BIN) -p python3.8 $(VENV_DIR)
 	$@ -m pip install -r requirements.txt
 
 $(MAKO_RENDER): $(PYTHON_BIN) $(wildcard $(MAKO_LIB_DIR)/*)