From 5ffaf8c680e396f229774e4947479ac743d363b1 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 3 Dec 2025 20:48:28 +0100 Subject: [PATCH] defs-[dev|dist].mk: Add DATA_DIR, JSON_DIR Define DATA_DIR, the directory where read-only, non-executable and non-configurable resources should be stored. And define JSON_DIR as $(DATA_DIR)/json. Signed-off-by: Jan Lindemann --- make/defs-dev.mk | 4 +++- make/defs-dist.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/make/defs-dev.mk b/make/defs-dev.mk index ffaa8ead..869ad322 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -31,7 +31,9 @@ LOG_PREFIX ?= $(PREFIX)/log JAVA_PREFIX ?= $(PREFIX) HDR_SCOPE_PREFIX ?= -IMAGEDIR ?= $(JWBDIR)/../../images +DATA_DIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data +IMAGEDIR ?= $(DATA_DIR)/images +JSON_DIR ?= $(DATA_DIR)/json CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME) PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 6601515f..e8d07b03 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -31,7 +31,9 @@ LOG_PREFIX ?= $(ENV_PREFIX)/var/log JAVA_PREFIX ?= $(PREFIX) HDR_SCOPE_PREFIX ?= -IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images +DATA_DIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data +IMAGEDIR ?= $(DATA_DIR)/images +JSON_DIR ?= $(DATA_DIR)/json CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d