From 950a8e7eee9f8c0d48e9f704b8a1fc851cee0a7c Mon Sep 17 00:00:00 2001
From: Mohsen Hariri <mhariri68@gmail.com>
Date: Sun, 21 Jul 2024 23:12:18 -0400
Subject: [PATCH] conda support

---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 99b436f..7b8753f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,14 @@ ENV_JUPYTER := $(ENV_PATH_ROOT)/jupyter
 JUPYTER_PORT := 3000
 
 ifeq ($(strip $(VIRTUAL_ENV)),)
-	PATH := $(ENV_PATH)/$(ENV_NAME)/bin:$(PATH)
-    PY := $(ENV_PATH)/$(ENV_NAME)/bin/python
-else
+	ifeq ($(strip $(CONDA_PREFIX)),)
+		PATH := $(ENV_PATH)/$(ENV_NAME)/bin:$(PATH)
+		PY := $(ENV_PATH)/$(ENV_NAME)/bin/python
+	else
+		PATH := $(CONDA_PREFIX)/bin:$(PATH)
+		PY := $(CONDA_PREFIX)/bin/python
+	endif
+else	
 	PATH := $(VIRTUAL_ENV)/bin:$(PATH)
 	PY := $(VIRTUAL_ENV)/bin/python
 endif