From 955d5b4a3ead04b41167f6ac969f823d3d4a4d5d Mon Sep 17 00:00:00 2001
From: aschwinn <al.schwinn@gsi.de>
Date: Thu, 1 Sep 2016 15:36:31 +0200
Subject: [PATCH] changed path to generic makefile on asl744
---
silecs-communication-cpp/Makefile | 4 ++--
silecs-communication-cpp/releaseSilecs.sh | 5 +++--
silecs-diagnostic-cpp/Makefile | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/silecs-communication-cpp/Makefile b/silecs-communication-cpp/Makefile
index 186f2ec..5d43149 100644
--- a/silecs-communication-cpp/Makefile
+++ b/silecs-communication-cpp/Makefile
@@ -18,8 +18,8 @@ PRODUCT = communication
VERSION = 1.0.4
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.9.0
# product configuration
LIB_NAME = comm
diff --git a/silecs-communication-cpp/releaseSilecs.sh b/silecs-communication-cpp/releaseSilecs.sh
index 22fcb5e..0fcbbad 100755
--- a/silecs-communication-cpp/releaseSilecs.sh
+++ b/silecs-communication-cpp/releaseSilecs.sh
@@ -22,7 +22,7 @@ checkFolderExists()
if [ ! -d ${FOLDER} ]; then
echo "Error: The folder '${FOLDER}' is needed in order to finish the installation."
echo "Installation cancelled."
- exit 1
+ return 1
fi
}
@@ -77,6 +77,7 @@ patch()
INSTALL_DIR=${RELEASE_DIR_BASE}/${PACKAGE}/${NEW_VERSION}
BASE_DIR=${RELEASE_DIR_BASE}/${PACKAGE}/${BASE_VERSION}
checkFolderExists ${BASE_DIR}
+ checkFolderExists ${INSTALL_DIR}
if [ "$PACKAGE" == "$PACKAGE_TO_PATCH" ]; then
if [ -d ${INSTALL_DIR} ]; then
if [ -L ${INSTALL_DIR} ]; then
@@ -103,4 +104,4 @@ patch()
fi
done
return 0
-}
\ No newline at end of file
+}
diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile
index 14f2f7a..2810859 100644
--- a/silecs-diagnostic-cpp/Makefile
+++ b/silecs-diagnostic-cpp/Makefile
@@ -19,7 +19,7 @@ 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 ?= /opt/cern/buildsystem/generic/2.9.0
# product configuration
BIN_NAME = $(PROJECT)-$(PRODUCT)
--
GitLab