--- perl-5.8.4.ebuild.orig	2004-07-27 23:57:59.669458536 -0400
+++ perl-5.8.4.ebuild	2004-07-28 00:02:03.321417808 -0400
@@ -189,12 +189,17 @@
 		-Dd_dosuid \
 		-Dd_semctl_semun \
 		-Dscriptdir=/usr/bin \
+		-Dman1dir=/usr/share/man/man1 \
+		-Dman3dir=/usr/share/man/man3 \
+		-Dinstallman1dir=${D}/usr/share/man/man1 \
+		-Dinstallman3dir=${D}/usr/share/man/man3 \
+		-Dman1ext='1' \
 		-Dman3ext='3pm' \
 		-Dcf_by='Gentoo' \
 		-Ud_csh \
 		${myconf} || die "Unable to configure"
 
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make"
+	emake -j1 || die "Unable to make"
 
 	if ! hasq maketest $RESTRICT; then
 		use uclibc && export MAKEOPTS="${MAKEOPTS} -j1"
@@ -217,10 +222,7 @@
 	# Fix for "stupid" modules and programs
 	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
 
-	make DESTDIR="${D}" \
-		INSTALLMAN1DIR="${D}/usr/share/man/man1" \
-		INSTALLMAN3DIR="${D}/usr/share/man/man3" \
-		install || die "Unable to make install"
+	make DESTDIR="${D}" install || die "Unable to make install"
 
 	cp -f utils/h2ph utils/h2ph_patched
 	epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
@@ -251,13 +253,6 @@
 	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
 	fperms 0755 /usr/bin/xsubpp
 
-	if ! hasq noman $FEATURES; then
-		# executing a binary we just built is not very cross
-		# compiler friendly.
-		./perl installman \
-			--destdir="${D}" --man1ext='1' --man3ext='3'
-	fi
-
 	# This removes ${D} from Config.pm and .packlist
 	for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
 		einfo "Removing ${D} from ${i}..."