Revert "Fetch the custom cfg/CONFIG_* files early"
This reverts commit e4fbd83c93.
It introduced a build problem when using INSTALL_LOCATION:
The system yacc and lex are used instead of the EPICS antelope and e_flex.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user