From 00fee8605a63e16bc72c60d8f38c529ea72dee3e Mon Sep 17 00:00:00 2001 From: aschwinn <al.schwinn@gsi.de> Date: Fri, 5 Aug 2016 15:20:59 +0200 Subject: [PATCH] Bug 1175 - Provide silecs instalation on CentOS7 cluster --- silecs-diagnostic-cpp/Makefile | 4 ++-- silecs-diagnostic-cpp/Makefile.dep | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile index b2baf9c..14f2f7a 100644 --- a/silecs-diagnostic-cpp/Makefile +++ b/silecs-diagnostic-cpp/Makefile @@ -18,8 +18,8 @@ PRODUCT = diagnostic VERSION = 1.0.2 SKIP_MANIFEST = TRUE -COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles -#COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20 +#COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles +COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20 # product configuration BIN_NAME = $(PROJECT)-$(PRODUCT) diff --git a/silecs-diagnostic-cpp/Makefile.dep b/silecs-diagnostic-cpp/Makefile.dep index 7454b8d..1041b87 100644 --- a/silecs-diagnostic-cpp/Makefile.dep +++ b/silecs-diagnostic-cpp/Makefile.dep @@ -5,11 +5,11 @@ SILECS_COMM_VERSION = 1.0.2 BOOST_HOME ?= /acc/local/$(CPU)/3rdparty/boost/$(BOOST_VERSION) RBACK_HOME ?= /acc/local/$(CPU)/cmw/cmw-rbac/$(RBAC_VERSION) -SILECS_COMM_HOME ?= ../silecs-communication-cpp/build +SILECS_COMM_HOME ?= ../../git/silecs-communication-cpp/build -LIBXML_PATH = /usr/include/libxml2/ +LIBXML_PATH ?= /usr/include/libxml2/ -SNAP7_BASE = ../snap7/snap7-full +SNAP7_BASE ?= ../../git/snap7/snap7-full DEPENDENT_COMPILER_OPTIONS += -I$(RBACK_HOME)/include DEPENDENT_COMPILER_OPTIONS += -I$(SILECS_COMM_HOME)/include -- GitLab