Fetch epicsEnvVars data from CONFIG_ENV in EPICS base

Author: simon-ess

iocAdmin/Db/Makefile

@@ -12,7 +12,6 @@ include $(TOP)/configure/CONFIG
 # databases, templates, substitutions like this
 #
 DB += siteEnvVars.db
-DB += epicsEnvVars.db
 DB += iocAdminScanMon.db
 DB += ioc.db
 DB += iocRTOS.db
@@ -38,17 +37,17 @@ include $(TOP)/configure/RULES
 #----------------------------------------
 #  ADD RULES AFTER THIS LINE
 
-$(COMMON_DIR)/iocAdminRTEMS.db:   $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db
+$(COMMON_DIR)/iocAdminRTEMS.db:   $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db
 
-$(COMMON_DIR)/iocAdminSoft.db:    $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db
+$(COMMON_DIR)/iocAdminSoft.db:    $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db
 
-$(COMMON_DIR)/iocAdminVxWorks.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db
+$(COMMON_DIR)/iocAdminVxWorks.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db
 
-$(COMMON_DIR)/siteEnvVars.substitutions: $(EPICS_BASE)/configure/CONFIG_SITE_ENV
-	@echo Expanding siteEnvVars.substitutions from CONFIG_SITE_ENV....
+$(COMMON_DIR)/siteEnvVars.substitutions: $(EPICS_BASE)/configure/CONFIG_SITE_ENV $(EPICS_BASE)/configure/CONFIG_ENV
+	@echo Expanding siteEnvVars.substitutions from $^....
 	@echo file iocEnvVar.template > $@
 	@echo { >> $@
 	@echo pattern >> $@
 	@echo { ENVNAME, ENVVAR, ENVTYPE } >> $@
-	@sed -n "s/^EPICS_\([A-Z_]*\).*/{\1, EPICS_\1, epics}/p" $< >> $@
+	@sed -n "s/^EPICS_\([A-Z_]*\).*/{\1, EPICS_\1, epics}/p" $^ >> $@
 	@echo } >> $@

iocAdmin/Db/epicsEnvVars.substitutions

@@ -32,7 +32,7 @@ file iocRTEMSOnly.template
 pattern { IOCNAME }
         { "$(IOC)"  }
 }
-file epicsEnvVars.db
+file siteEnvVars.db
 {
 pattern { IOCNAME, }
         { "$(IOC)" }

iocAdmin/Db/iocAdminRTEMS.substitutions

@@ -22,11 +22,6 @@ file iocAdminScanMon.db
         { IOCNAME }
         { "$(IOC)" }
 }
-file epicsEnvVars.db
-{
-pattern { IOCNAME, }
-	{ "$(IOC)" }
-}
 
 file siteEnvVars.db
 {

iocAdmin/Db/iocAdminSoft.substitutions

@@ -32,7 +32,7 @@ file iocVxWorksOnly.template
 pattern { IOCNAME , DAT_MBUF_FLNK     }
         { "$(IOC)"  , "$(IOC):CLUST_0_0_0"}
 }
-file epicsEnvVars.db
+file siteEnvVars.db
 {
 pattern { IOCNAME, }
         { "$(IOC)" }