From 290edbe2e2b22b2cc0178908e9dec6a7d953416f Mon Sep 17 00:00:00 2001
From: Sebastien Mirolo <smirolo@djaodjin.com>
Date: Fri, 4 Oct 2024 15:36:42 -0700
Subject: [PATCH] defaults installTop to srcDir if VIRTUAL_ENV is not defined

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6580e26f..335d1d76 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ APP_PORT      ?= 8000
 LIVEDEMO_ENTRY_POINT ?= http://djaopsp-demo
 
 srcDir        ?= .
-installTop    ?= $(VIRTUAL_ENV)
+installTop    ?= $(if $(VIRTUAL_ENV),$(VIRTUAL_ENV),$(abspath $(srcDir))/.venv)
 binDir        ?= $(installTop)/bin
 libDir        ?= $(installTop)/lib
 SYSCONFDIR    ?= $(installTop)/etc
 LOCALSTATEDIR ?= $(installTop)/var
 CONFIG_DIR    ?= $(SYSCONFDIR)/$(APP_NAME)
 ASSETS_DIR    ?= $(srcDir)/htdocs/assets
-RUN_DIR       ?= $(abspath $(srcDir))
+RUN_DIR       ?= $(installTop)/var/run
 
 installDirs   ?= /usr/bin/install -d
 installFiles  ?= /usr/bin/install -p -m 644