From 8996ab2b5c90f0e9428b5d5439fdf11bb82d39e2 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 14 Apr 2004 16:22:31 +0000 Subject: [PATCH] Replace all the $(HOME)/... includes with a minimal and sufficient set which will not cause problems if $(HOME) is also a regular . --- configure/CONFIG | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/configure/CONFIG b/configure/CONFIG index 36d6224e5..212748785 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -23,8 +23,10 @@ CONFIG ?= $(TOP)/configure -include $(CONFIG)/RELEASE -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH) +ifdef T_A -include $(CONFIG)/RELEASE.Common.$(T_A) -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A) +endif include $(CONFIG)/CONFIG_COMMON @@ -68,21 +70,11 @@ endif # User specific definitions # --include $(HOME)/configure/CONFIG --include $(HOME)/os/configure/CONFIG.Host.$(HOST_ARCH) --include $(HOME)/os/configure/CONFIG.Host.$(EPICS_HOST_ARCH) --include $(HOME)/os/configure/CONFIG.$(HOST_ARCH).Common --include $(HOME)/os/configure/CONFIG.$(EPICS_HOST_ARCH).Common +-include $(HOME)/configure/CONFIG_USER +-include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH) ifdef T_A --include $(HOME)/configure/CONFIG.$(OS_CLASS) --include $(HOME)/configure/CONFIG.Target.$(T_A) --include $(HOME)/configure/CONFIG.Common.$(T_A) --include $(HOME)/configure/CONFIG.$(HOST_ARCH).$(T_A) --include $(HOME)/configure/CONFIG.$(EPICS_HOST_ARCH).$(T_A) --include $(HOME)/configure/os/CONFIG.Target.$(T_A) --include $(HOME)/configure/os/CONFIG.Common.$(T_A) --include $(HOME)/configure/os/CONFIG.$(HOST_ARCH).$(T_A) --include $(HOME)/configure/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A) +-include $(HOME)/configure/CONFIG_USER.Common.$(T_A) +-include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH).$(T_A) endif # All options