teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-style/cmake: do not use absolute path in CMAKE_INSTALL_{LIB,SBIN}DIR 

...otherwise it ends up with /usr/usr/lib or /usr/usr/bin.

Partially revert PR #4230.
This commit is contained in:
Alessio Sergi 2016-06-26 00:48:46 +02:00
parent 78198e09ea
commit 2c02e09892
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/build-style/cmake.sh
View File

@ -26,12 +26,12 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=/usr/lib32"
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib32"
else
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=/usr/lib"
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib"
fi
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=/usr/bin"
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')