hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-07-31 15:57:05 +03:00
parent 39629c412d 95c254a8b0
commit 3eb99139f5
27 changed files with 389 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BUILD/install_build_deps.sh
View File

@ -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 wget \
@ -35,6 +35,7 @@ then
fi
else
## RPM-based distro
install_libdir=/usr/lib64
command -v yum
if [ $? != 0 ]
@ -142,7 +143,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