epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fetch the custom cfg/CONFIG_* files early

Browse Source 
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.
This commit is contained in:
Simon Rose
2025-08-28 16:04:01 +02:00
committed by Andrew Johnson
parent 2e26ec09a6
commit e4fbd83c93
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/CONFIG
View File

@@ -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