From a1dc16848c8ab0ff26501060873fde0bd1e6d6dc Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 14 Jun 2017 10:03:43 -0500 Subject: [PATCH] configure: Fix include CONFIG_APP_INCLUDE which needs to happen *after* CONFIG_SITE overrides. --- configure/CONFIG | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure/CONFIG b/configure/CONFIG index 24efbff86..6fe6b9b55 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -75,17 +75,17 @@ ifdef T_A # -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A) + # Site specific target and host-target definitions and overrides + # + -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A) + -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) + # RELEASE file specific definitions # ifneq ($(CONFIG),$(TOP)/configure) -include $(CONFIG)/CONFIG_APP_INCLUDE endif - # Site specific target and host-target definitions - # - -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A) - -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) - endif # ifdef T_A