From 2148d78d3f8477ec0fd6013823a2a8f205740805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 25 Jul 2017 09:23:42 +0300 Subject: [PATCH] MXS-1324: Fix build scripts for Debian-based systems The avrorouter dependencies weren't correctly built for Debian-based systems. This is due to the different way Debian and RHEL store libraries. --- BUILD/install_build_deps.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BUILD/install_build_deps.sh b/BUILD/install_build_deps.sh index 9b374eae4..00d822655 100755 --- a/BUILD/install_build_deps.sh +++ b/BUILD/install_build_deps.sh @@ -9,7 +9,7 @@ command -v apt-get if [ $? == 0 ] then # DEB-based distro - + install_libdir=/usr/lib sudo apt-get update sudo apt-get install -y --force-yes dpkg-dev git gcc g++ ncurses-dev bison \ @@ -18,6 +18,7 @@ then sqlite3 liblua5.1 liblua5.1-dev wget else ## RPM-based distro + install_libdir=/usr/lib64 command -v yum if [ $? != 0 ] @@ -123,7 +124,7 @@ fi mkdir -p jansson/build pushd jansson/build -cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DJANSSON_INSTALL_LIB_DIR=/usr/lib64 +cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DJANSSON_INSTALL_LIB_DIR=$install_libdir make sudo make install popd