From fa53d7225837322a04e9362e80ff78f4bbc36719 Mon Sep 17 00:00:00 2001 From: dhickin Date: Wed, 2 Jul 2014 12:27:00 +0100 Subject: [PATCH] Corrected includes for CONFIG_SITE files. --- arrayPerformance/configure/CONFIG_SITE | 4 ++-- configure/CONFIG_SITE | 3 +-- exampleDatabase/configure/CONFIG_SITE | 3 +-- exampleLink/configure/CONFIG_SITE | 4 ++-- examplePowerSupply/configure/CONFIG_SITE | 4 ++-- exampleServer/configure/CONFIG_SITE | 4 ++-- test/configure/CONFIG_SITE | 5 +++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/arrayPerformance/configure/CONFIG_SITE b/arrayPerformance/configure/CONFIG_SITE index 9e1ec9a..5718c1c 100644 --- a/arrayPerformance/configure/CONFIG_SITE +++ b/arrayPerformance/configure/CONFIG_SITE @@ -35,5 +35,5 @@ INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG.local diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 3d2a190..83b2d5c 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -23,6 +23,5 @@ INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include --include $(TOP)/../CONFIG_SITE.local +-include $(TOP)/../CONFIG.local -include $(TOP)/configure/CONFIG_SITE.local - diff --git a/exampleDatabase/configure/CONFIG_SITE b/exampleDatabase/configure/CONFIG_SITE index a6c6281..82f4ecf 100644 --- a/exampleDatabase/configure/CONFIG_SITE +++ b/exampleDatabase/configure/CONFIG_SITE @@ -24,5 +24,4 @@ INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include -include $(TOP)/../configure/CONFIG_SITE.local --include $(TOP)/../../CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../../CONFIG.local diff --git a/exampleLink/configure/CONFIG_SITE b/exampleLink/configure/CONFIG_SITE index 9e1ec9a..5718c1c 100644 --- a/exampleLink/configure/CONFIG_SITE +++ b/exampleLink/configure/CONFIG_SITE @@ -35,5 +35,5 @@ INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG.local diff --git a/examplePowerSupply/configure/CONFIG_SITE b/examplePowerSupply/configure/CONFIG_SITE index 9e1ec9a..5718c1c 100644 --- a/examplePowerSupply/configure/CONFIG_SITE +++ b/examplePowerSupply/configure/CONFIG_SITE @@ -35,5 +35,5 @@ INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG.local diff --git a/exampleServer/configure/CONFIG_SITE b/exampleServer/configure/CONFIG_SITE index 9e1ec9a..5718c1c 100644 --- a/exampleServer/configure/CONFIG_SITE +++ b/exampleServer/configure/CONFIG_SITE @@ -35,5 +35,5 @@ INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG.local diff --git a/test/configure/CONFIG_SITE b/test/configure/CONFIG_SITE index 9e1ec9a..b637f9f 100644 --- a/test/configure/CONFIG_SITE +++ b/test/configure/CONFIG_SITE @@ -35,5 +35,6 @@ INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG.local +