--- gettext-0.15-r1.ebuild.orig	2006-11-12 17:56:15.000000000 +0000
+++ gettext-0.15-r1.ebuild	2006-11-12 18:19:42.000000000 +0000
@@ -33,14 +33,6 @@
 		-e '2iexit 77' \
 		autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
 
-	# use Gentoo std docdir
-	sed -i \
-		-e "/^docdir=/s:=.*:=/usr/share/doc/${PF}:" \
-		gettext-runtime/configure \
-		gettext-tools/configure \
-		gettext-tools/examples/installpaths.in \
-		|| die "sed docdir"
-
 	# sanity check for Bug 105304
 	if [[ -z ${USERLAND} ]] ; then
 		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
@@ -61,6 +53,7 @@
 	econf \
 		$(use_with emacs) \
 		--disable-java \
+		--docdir="/usr/share/doc/${PF}" \
 		${myconf} \
 		|| die
 	emake || die
@@ -101,11 +94,11 @@
 		gen_usr_ldscript ${libname}
 	fi
 
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/html
+	if use doc ; then
+		dohtml "${D}"/usr/share/doc/${PF}/*.html
+	else
 		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
 	fi
-	dohtml "${D}"/usr/share/doc/${PF}/*.html
 	rm -f "${D}"/usr/share/doc/${PF}/*.html
 
 	# Remove emacs site-lisp stuff if 'emacs' is not in USE