From 2c02e09892a9adcf3f6562f7a1d0a598423cdc1d Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 26 Jun 2016 00:48:46 +0200 Subject: [PATCH] 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. --- common/build-style/cmake.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 75c532fbb0c..5fc1621b739 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -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')