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

make "local" *.local files take precedence over those in TOP/..

Browse Source
This commit is contained in:
dhickin
2014-12-03 16:52:01 +00:00
parent e9ce6a2f0b
commit 7743f3e3fd
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arrayPerformance/configure/CONFIG_SITE
View File

@ -35,5 +35,5 @@
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-include $(TOP)/../configure/CONFIG_SITE.local
-include $(TOP)/../../CONFIG_SITE.local -include $(TOP)/../../CONFIG_SITE.local
-include $(TOP)/../configure/CONFIG_SITE.local

2
exampleDatabase/configure/CONFIG_SITE
View File

@ -23,5 +23,5 @@ CHECK_RELEASE = WARN
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-include $(TOP)/../configure/CONFIG_SITE.local
-include $(TOP)/../../CONFIG_SITE.local -include $(TOP)/../../CONFIG_SITE.local
-include $(TOP)/../configure/CONFIG_SITE.local

2
exampleLink/configure/CONFIG_SITE
View File

@ -35,5 +35,5 @@
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-include $(TOP)/../configure/CONFIG_SITE.local
-include $(TOP)/../../CONFIG_SITE.local -include $(TOP)/../../CONFIG_SITE.local
-include $(TOP)/../configure/CONFIG_SITE.local

2
examplePowerSupply/configure/CONFIG_SITE
View File

@ -35,5 +35,5 @@
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-include $(TOP)/../configure/CONFIG_SITE.local
-include $(TOP)/../../CONFIG_SITE.local -include $(TOP)/../../CONFIG_SITE.local
-include $(TOP)/../configure/CONFIG_SITE.local

2
exampleServer/configure/CONFIG_SITE
View File

@ -35,5 +35,5 @@
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-include $(TOP)/../configure/CONFIG_SITE.local
-include $(TOP)/../../CONFIG_SITE.local -include $(TOP)/../../CONFIG_SITE.local
-include $(TOP)/../configure/CONFIG_SITE.local

3
test/configure/CONFIG_SITE
View File

@ -35,6 +35,5 @@
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-include $(TOP)/../configure/CONFIG_SITE.local
-include $(TOP)/../../CONFIG_SITE.local -include $(TOP)/../../CONFIG_SITE.local
-include $(TOP)/../configure/CONFIG_SITE.local