--- Macaulay2-0.9.95-r1.ebuild.old	2007-05-29 19:22:03.000000000 -0400
+++ Macaulay2-0.9.95-r1.ebuild	2007-05-29 21:19:31.000000000 -0400
@@ -45,9 +45,9 @@
 	make install || die "failed to install factory"
 
 	cd "${WORKDIR}/libfac"
-	CPPFLAGS="-I${WORKDIR}/include" ./configure --with-NOSTREAMIO \
+	CPPFLAGS="-I${WORKDIR}/include" econf --with-NOSTREAMIO \
 		--prefix="${WORKDIR}" || die "failed to configure libfac"
-	make DEFS=-DHAVE_SINGULAR_ERROR || die "failed to build libfac"
+	emake DEFS=-DHAVE_SINGULAR_ERROR || die "failed to build libfac"
 	make install || die "failed to install libfac"
 
 	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
@@ -55,13 +55,13 @@
 	sed -e "/^docm2RelDir/s:Macaulay2:${P}:" \
 		-i include/config.Makefile.in || \
 		die "failed to fix makefile"
-	make && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
+	emake -j1 && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
 		LDFLAGS="-L${WORKDIR}/$(get_libdir)" \
 		./configure --prefix="${D}/usr" --disable-encap \
 		--with-lapacklibs="-llapack -lblas" || \
 		die "failed to configure Macaulay"
 	# fix install paths
-	make || die "failed to build Macaulay"
+	emake -j1 || die "failed to build Macaulay"
 }
 
 src_test() {