From f32a1f6e0ecbb453028d33e439576419c46af7fc Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Tue, 21 Nov 2023 10:53:19 -0500 Subject: [PATCH] add make CONDA_BIN override --- Makefile | 2 +- Makefile.config.example | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 90bd416db..75a470cff 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ else else CONDA_BIN_DIR ?= $(CONDA_HOME)/bin endif - CONDA_BIN := $(CONDA_BIN_DIR)/conda + CONDA_BIN ?= $(CONDA_BIN_DIR)/conda CONDA_ENV_REAL_TARGET_PATH := $(realpath $(CONDA_ENV_PATH)) CONDA_ENV_REAL_ACTIVE_PATH := $(realpath ${CONDA_PREFIX}) diff --git a/Makefile.config.example b/Makefile.config.example index ceeb741d0..cbdfb13e2 100644 --- a/Makefile.config.example +++ b/Makefile.config.example @@ -1,6 +1,7 @@ CONDA_HOME ?= /opt/conda CONDA_ENV ?= weaver CONDA_ENVS_DIR ?= /opt/conda/envs +CONDA_BIN ?= $(CONDA_HOME)/bin/conda HOSTNAME ?= localhost HTTP_PORT ?= 8094