From e4fbd83c93a68a1d9cb863ff341735388d246347 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 28 Aug 2025 16:04:01 +0200
Subject: [PATCH] Fetch the custom cfg/CONFIG_* files early

If you overwrite INSTALL_LOCATION in CONFIG_SITE, then it would be the case that
TOP_CFG_CONFIGS would point to those from EPICS base and not from the module
that you are loading. Fetching these earlier fixes that issue.
---
 configure/CONFIG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure/CONFIG b/configure/CONFIG
index e72537db1..edf8d4f73 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -50,6 +50,9 @@ endif
 include $(CONFIG)/CONFIG_COMMON
 include $(CONFIG)/CONFIG_FILE_TYPE
 
+# Fetch the module-specific CFGS before overwriting INSTALL_LOCATION in order to load them later
+TOP_CFG_CONFIGS := $(wildcard $(INSTALL_CFG)/CONFIG*)
+
 #  Base-specific build options
 #
 include $(CONFIG)/CONFIG_BASE
@@ -117,7 +120,6 @@ endif
 
 # Include $(INSTALL_CFG)/CONFIG* definitions
 #
-TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*)
 ifneq ($(TOP_CFG_CONFIGS),)
   include $(TOP_CFG_CONFIGS)
 endif