--- smage/trunk/include/alx-split.sminc	2015/03/20 09:50:48	6072
+++ smage/trunk/include/alx-split.sminc	2015/07/30 15:49:15	6979
@@ -72,10 +72,10 @@
 	{
 		DESCRIPTION=\"${DESCRIPTION}\"
 		DEPEND=\"${DEPEND}\"
-		if [[ ! -z ${ALX_DEPEND} ]]
+		if [[ ! -z \${ALX_DEPEND} ]]
 		then
-			DEPEND=\"${DEPEND}
-				${ALX_DEPEND}\"
+			DEPEND=\"\${DEPEND}
+				\${ALX_DEPEND}\"
 		fi
 		_PNAME=\"${PNAME}\"
 	}"
@@ -87,15 +87,31 @@
 	{
 		DESCRIPTION=\"Development files for ${PCAT}/${PNAME}-${PVER}-${PBUILD}.\"
 		DEPEND=\"== ${PCAT}/${PNAME}-${PVER}\"
-		if [[ ! -z ${ALX_DEV_DEPEND} ]]
+		if [[ ! -z \${ALX_DEV_DEPEND} ]]
 		then
-			DEPEND=\"${DEPEND}
-				${ALX_DEV_DEPEND}\"
+			DEPEND=\"\${DEPEND}
+				\${ALX_DEV_DEPEND}\"
 		fi
 		_PNAME=\"${PNAME}\"
 	}"
 }
 
+# honor multilib builds
+if [[ ${MULTILIB_BUILD} = true ]]
+then
+	if [[ ! -z $(typeset -f src_install) ]]
+	then
+		# rename the old one
+		old_alx_src_install=old$(typeset -f src_install)
+		eval "${old_alx_src_install}"
+
+		alx_generic_src_install()
+		{
+			old_alx_src_install || die
+		}
+	fi
+fi
+
 alx-split_generate_src_install_dev()
 {
 	eval "alx-split_src_install_${PNAME}-dev()