--- smage/trunk/include/mcore-split.sminc	2010/01/03 22:24:59	39
+++ smage/trunk/include/mcore-split.sminc	2010/01/04 10:53:56	44
@@ -29,8 +29,8 @@
 	eval "mcore-split_src_install_${PNAME}-dev()
 	{
 		cd ${SRCDIR}
-		mmake DESTDIR=${BINDIR} install || die
-		zapmost ${BINDIR} \
+		mmake DESTDIR=\${BINDIR} install || die
+		zapmost \${BINDIR} \
 			usr/$(mlibdir)/*.a \
 			usr/$(mlibdir)/*.la \
 			usr/share/man \
@@ -38,6 +38,18 @@
 			usr/include \
 			${MCORE_DEV_ZAPMOST_OPTS} \
 			|| die
+
+		if [[ ! -z ${MCORE_DEV_RM_OPTS} ]]
+		then
+			local i
+			for i in ${MCORE_DEV_RM_OPTS}
+			do
+				if [[ -d \${BINDIR}/${i} ]]
+				then
+					rm -r \${BINDIR}/${i} || die
+				fi
+			done
+		fi
 	}"
 }
 
@@ -46,9 +58,9 @@
 	eval "mcore-split_src_install_${PNAME}()
 	{
 		cd ${SRCDIR}
-		mmake DESTDIR=${BINDIR} install || die
-		find ${BINDIR}/usr/$(mlibdir) -name \*.a | xargs rm
-		find ${BINDIR}/usr/$(mlibdir) -name \*.la | xargs rm
+		mmake DESTDIR=\${BINDIR} install || die
+		find \${BINDIR}/usr/$(mlibdir) -name \*.a | xargs rm
+		find \${BINDIR}/usr/$(mlibdir) -name \*.la | xargs rm
 
 		local i
 		for i in usr/share/man \
@@ -56,11 +68,16 @@
 			usr/share/include \
 			${MCORE_RM_OPTS}
 		do
-			if [[ -d ${BINDIR}/${i} ]]
+			if [[ -d \${BINDIR}/${i} ]]
 			then
-				rm -r ${BINDIR}/${i} || die
+				rm -r \${BINDIR}/${i} || die
 			fi
 		done
+
+		if [[ ! -z ${MCORE_ZAPMOST_OPTS} ]]
+		then
+			zapmost \${BINDIR} ${MCORE_ZAPMOST_OPTS} || die
+		fi
 	}"
 }