--- amiwm-0.20_p48.ebuild.orig	2010-03-12 18:09:03.000000000 +0100
+++ amiwm-0.20_p48.ebuild.orig	2010-03-12 18:09:19.000000000 +0100
@@ -1,4 +1,4 @@ 
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.10 2009/12/27 13:33:41 flameeyes Exp $
 
@@ -26,11 +26,13 @@ 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}"/${P}-flex.patch #110169
+	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' Makefile.in || die
 }
 
 src_compile() {
-	econf
+	econf || die
 	# bug #248680
 	emake -j1 || die "build failed"
 }
@@ -42,11 +44,11 @@ 
 	rm "${D}"/usr/bin/requestchoice
 	dosym /usr/lib/amiwm/requestchoice /usr/bin/requestchoice
 
-	dosed /usr/lib/amiwm/{Xinitrc,Xsession,Xsession2}
+	dosed /usr/$(get_libdir)/amiwm/{Xinitrc,Xsession,Xsession2}
 
-	dodoc INSTALL README*
+	dodoc INSTALL README* || die
 
 	exeinto /etc/X11/Sessions
 	echo "/usr/bin/amiwm" > "${T}"/amiwm
-	doexe "${T}"/amiwm
+	doexe "${T}"/amiwm || die
 }