--- trunk/include/cmake.sminc 2017/10/20 08:22:50 30001 +++ trunk/include/cmake.sminc 2017/10/20 08:24:46 30002 @@ -215,8 +215,7 @@ cmake_src_install() { - cd ${BUILDDIR}/build - make ${MAKEOPTS} DESTDIR=${BINDIR} install || die + cmake_mmake DESTDIR=${BINDIR} install || die cd ${SRCDIR} local i @@ -234,14 +233,13 @@ { local abi local abis_to_run="${MULTILIB_ABIS}" - + + cmake_mmake DESTDIR=${BINDIR} install || die + # respect MULTILIB_ONLY_ABI variable [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}" for abi in ${abis_to_run} do - cd ${BUILDDIR}/build-${abi} - abi-${abi} make ${MAKEOPTS} DESTDIR=${BINDIR} install || die - cd ${SRCDIR}-${abi} local i for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \