--- trunk/include/meson.sminc	2018/03/27 12:08:28	30741
+++ trunk/include/meson.sminc	2018/05/15 07:24:41	30900
@@ -39,6 +39,18 @@
 	echo "-Dwith-{feature}=false"
 }
 
+meson_bool_true()
+{
+	local feature="$1"
+	meson_opt "feature" "true"
+}
+
+meson_bool_false()
+{
+	local feature="$1"
+	meson_opt "feature" "false"
+}
+
 # generic meson opts
 meson_opt()
 {
@@ -61,16 +73,17 @@
 	default_opts+=" --prefix=/usr"
 	default_opts+=" --sysconfdir=/etc"
 	default_opts+=" --localstatedir=/var/lib"
-	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)'
+		default_opts+=' --libexecdir=/usr/$(mlibdir)/${PNAME}'
 		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)"
+		default_opts+=" --libexecdir=/usr/$(mlibdir)/${PNAME}"
 		meson setup ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} ${BUILDDIR}/build || die
 	fi
 }