From 1aa29fccbb20b52f0f83d3a84b73d4409bab97ff Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 20 Dec 2021 10:38:27 +0100
Subject: [PATCH] Small changes to allow cellbuild and to allow for overwriting
E3_CELL_PATH with env var
---
configure/E3/CONFIG_CELL | 2 +-
require-ess/tools/driver.makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure/E3/CONFIG_CELL b/configure/E3/CONFIG_CELL
index 4dafb395..742bd076 100644
--- a/configure/E3/CONFIG_CELL
+++ b/configure/E3/CONFIG_CELL
@@ -2,7 +2,7 @@
# TOP is e3-MODULENAME
ifneq (,$(findstring cell,$(MAKECMDGOALS)))
## Default is e3-MODULENAME/cellMods
-E3_CELL_PATH=$(TOP)/cellMods
+E3_CELL_PATH?=$(TOP)/cellMods
##
## Allow local file in $(TOP)/configure
## local file in $(TOP)/../
diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index 28b28a11..98462eec 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -869,7 +869,7 @@ ${DEPFILE}: ${LIBOBJS} $(USERMAKEFILE)
# Check dependencies on other module headers.
cat *.d 2>/dev/null | sed 's/ /\n/g' | grep -v '$(EPICS_BASE)/include' | sed -n '$(DEP_PARSER)' >> $@.tmp
# Manully added dependencies: ${REQ}
- @$(foreach m,${REQ},echo "$m $(or $(and $(wildcard $(E3_SITEMODS_PATH)/$m/$($m_VERSION)),$($m_VERSION)),$(error REQUIRED module '$m' version '$($m_VERSION)' does not exist))" >> $@.tmp;)
+ @$(foreach m,${REQ},echo "$m $(or $(and $(or $(wildcard $(EPICS_MODULES)/$m/$($m_VERSION)),$(wildcard $(E3_SITEMODS_PATH)/$m/$($m_VERSION))),$($m_VERSION)),$(error REQUIRED module '$m' version '$($m_VERSION)' does not exist))" >> $@.tmp;)
cat $@.tmp | sort -u >> $@
endif # In O.* directory
--
GitLab