Skip to content

Commit eb33785

Browse files
authored
Merge pull request #46 from jeonghanlee/master
Update configuration files to match latest epics modules environment
2 parents c9cfeb0 + fa7f2e3 commit eb33785

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

client/configure/CONFIG_SITE

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,14 @@ CHECK_RELEASE = YES
3232
# You must rebuild in the iocBoot directory for this to
3333
# take effect.
3434
#IOCS_APPL_TOP = </IOC/path/to/application/top>
35+
36+
USR_CXXFLAGS += -DUSE_TYPED_RSET
37+
38+
# These allow developers to override the CONFIG_SITE variable
39+
# settings without having to modify the configure/CONFIG_SITE
40+
# file itself.
41+
# To keep the same depth of other EPICS modules, we have to add
42+
# the additional `/../`, because of `client` directory.
43+
-include $(TOP)/../../CONFIG_SITE.local
44+
-include $(TOP)/../../configure/CONFIG_SITE.local
45+
-include $(TOP)/configure/CONFIG_SITE.local

client/configure/RELEASE

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
# other than EPICS_BASE:
2929
#RULES=/path/to/epics/support/module/rules/x-y
3030

31-
# The definitions shown below can also be placed in an untracked RELEASE.local
32-
-include $(TOP)/../RELEASE.local
31+
# These allow developers to override the RELEASE variable settings
32+
# without having to modify the configure/RELEASE file itself.
33+
# To keep the same depth of other EPICS modules, we have to add
34+
# the additional `/../`, because of `client` directory.
35+
-include $(TOP)/../../RELEASE.local
36+
-include $(TOP)/../../configure/RELEASE.local
3337
-include $(TOP)/configure/RELEASE.local

0 commit comments

Comments
 (0)