diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile
index b2baf9c84696939e3f8d9b4a3a6b2048219cf50c..14f2f7a21e436b3b4a9f5f33c5b59611478825d3 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 7454b8d53b310e3487f549aed18b2d6868a7813b..1041b87cb3d27f216bb1d531df5bfd3614df4f42 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