Skip to content
Snippets Groups Projects
Commit 94e0e26c authored by George Joseph's avatar George Joseph Committed by Gerrit Code Review
Browse files

Merge "CI: New way to determnine libdir" into 13

parents 44e65b92 e4ee209b
No related branches found
No related tags found
No related merge requests found
......@@ -89,7 +89,7 @@ runner ulimit -a
MAKE=`which make`
PKGCONFIG=`which pkg-config`
[ -d /usr/lib64 ] && _libdir=/usr/lib64
_libdir=`${CIDIR}/findLibdir.sh`
common_config_args="--prefix=/usr ${_libdir:+--libdir=${_libdir}} --sysconfdir=/etc --with-pjproject-bundled"
$PKGCONFIG 'jansson' || common_config_args+=" --with-jansson-bundled"
......
#!/usr/bin/env bash
source /etc/os-release
case $ID in
centos)
echo /usr/lib64
;;
fedora)
echo /usr/lib64
;;
ubuntu)
echo /usr/lib
esac
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment