--- trunk/include/cmake.sminc 2017/10/20 08:24:46 30002 +++ trunk/include/cmake.sminc 2017/10/27 08:58:33 30125 @@ -141,8 +141,18 @@ default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON" default_opts+=" -DCMAKE_BUILD_TYPE=Release" default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}" - default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)' - default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)' + if [[ ${MULTILIB_BUILD} = true ]] + then + # eval these variables later with the abi-${ABI} caller + default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)' + default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)' + default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)' + else + # eval these variables now + default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)" + default_opts+=" -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)" + default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)" + fi if [[ ${MULTILIB_BUILD} = true ]] then