epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Allow user specified db substitution file suffix.

Browse Source
This commit is contained in:
Janet Anderson
2014-02-20 15:03:23 -06:00
parent 84426ea334
commit b24d7c6da6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure/RULES.Db
View File

@@ -8,6 +8,9 @@
#*************************************************************************
#RULES.Db
# Set db substitutions file suffix
SUBST_SUFFIX ?= .substitutions
##################################################### vpath
vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
@@ -45,8 +48,6 @@ DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
#
# ---------------------------------------------------
SUBST_SUFFIX ?= .substitutions
DBDINC_NAME = $(patsubst %.h,%,$(patsubst %.dbd,%,$(DBDINC)))
DBD += $(addsuffix .dbd,$(DBDINC_NAME))
INC += $(addsuffix .h,$(DBDINC_NAME))

4
documentation/RELEASE_NOTES.html
View File

@@ -15,6 +15,10 @@ EPICS Base 3.15.0.x releases are not intended for use in production systems.</p>
<h2 align="center">Changes between 3.15.0.1 and 3.15.0.2</h2>
<!-- Insert new items immediately below here ... -->
<h3>User specified db substitution file suffix</h3>
<p>Per Dirk Zimoch's suggestion, a user specified db substitution file suffix is now allowed by setting the variable SUBST_SUFFIX in a configuration directory CONFIG_SITE file or in a Makefile before the include $(TOP)/configure/RULES line. The default is SUBST_SUFFIX=.substitutions.</p>
<h3>NTP Time Provider adjusts to OS tick rate changes</h3>
<p>Dirk Zimoch provided code that allows the NTP Time provider (used on VxWorks