--- smage/trunk/core/grub/grub-0.97-r17.smage2	2010/10/21 15:26:36	734
+++ smage/trunk/core/grub/grub-0.97-r17.smage2	2010/10/21 16:39:54	738
@@ -18,7 +18,15 @@
 SRCFILE="${PNAME}-${PVER}.tar.gz"
 SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
 
-sminclude mtools
+MCORE_ONLY_KEEP="boot/grub/stage1
+	boot/grub/stage2
+	boot/grub/reiserfs_stage1_5
+	boot/grub/e2fs_stage1_5
+	boot/grub/nbgrub
+	boot/grub/pxegrub
+	boot/grub/stage2.netboot
+	usr/sbin"
+sminclude mtools mcore-split
 
 SRC_URI=(
 	ftp://alpha.gnu.org/gnu/${PNAME}/${SRCFILE}
@@ -164,7 +172,7 @@
 	mmake || die
 }
 
-src_install()
+mcore_generic_src_install()
 {
 	cd ${SRCDIR}
 
@@ -173,13 +181,19 @@
 
 	mmake DESTDIR=${BINDIR} install || die
 
+	local archhost
+	case ${ARCH} in
+		i486) archhost="i386-${CHOST/i486-linux-gnu/}" ;;
+		*) archhost="${CHOST/-linux-gnu/}" ;;
+	esac
+
 	# install netboot grub
-	minstallexec nbgrub /usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/ || die 
-	minstallexec pxegrub /usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/ || die
-	minstallexec stage2/stage2.netboot /usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/ || die
+	minstallexec nbgrub /usr/$(mlibdir)/grub/${archhost}/ || die 
+	minstallexec pxegrub /usr/$(mlibdir)/grub/${archhost}/ || die
+	minstallexec stage2/stage2.netboot /usr/$(mlibdir)/grub/${archhost}/ || die
 
 	# now copying all stage files
-	for i in ${BINDIR}/usr/$(mlibdir)/grub/${CHOST/-linux-gnu/}/*
+	for i in ${BINDIR}/usr/$(mlibdir)/grub/${archhost}/*
 	do
 		[ -f ${i} ] && cp -p ${i} ${BINDIR}/boot/grub || die ${i}
 	done