From ec00f65236ccbb10b4ebd8d53f9cc0da33053efa Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 28 Oct 2025 10:40:50 +0100 Subject: [PATCH] Revert "Fetch the custom cfg/CONFIG_* files early" This reverts commit e4fbd83c93a68a1d9cb863ff341735388d246347. It introduced a build problem when using INSTALL_LOCATION: The system yacc and lex are used instead of the EPICS antelope and e_flex. --- configure/CONFIG | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure/CONFIG b/configure/CONFIG index edf8d4f73..e72537db1 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -50,9 +50,6 @@ 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 @@ -120,6 +117,7 @@ endif # Include $(INSTALL_CFG)/CONFIG* definitions # +TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*) ifneq ($(TOP_CFG_CONFIGS),) include $(TOP_CFG_CONFIGS) endif