--- trunk/include/meson.sminc 2017/10/12 14:09:19 29811 +++ trunk/include/meson.sminc 2018/03/27 12:08:28 30741 @@ -61,13 +61,16 @@ default_opts+=" --prefix=/usr" default_opts+=" --sysconfdir=/etc" default_opts+=" --localstatedir=/var/lib" - default_opts+=' --libdir=/usr/$(mlibdir)' default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}' if [[ ${MULTILIB_BUILD} = true ]] then + # must be escaped so the mlibdir variable gets evaluated later + default_opts+=' --libdir=/usr/$(mlibdir)' all-abis meson setup ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} ${BUILDDIR}/build-$(mabi) || die else + # the mlibdir variable gets right now evaluated + default_opts+=" --libdir=/usr/$(mlibdir)" meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die fi }