--- wmcalendar-0.5.0-r1.ebuild.orig	2008-03-30 17:04:28.816690127 +0100
+++ wmcalendar-0.5.0-r1.ebuild	2008-03-30 17:04:14.268919936 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild,v 1.5 2006/10/10 07:16:21 s4t4n Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 IUSE=""
 
@@ -26,22 +26,27 @@
 src_unpack()
 {
 	unpack ${A}
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	# default Makefile overwrites CC and CFLAGS variables so we patch it
-	epatch ${FILESDIR}/${P}.makefile.patch
+	epatch "${FILESDIR}"/${P}.makefile.patch
 
 	# Fix compilation issues with gcc >= 4
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 
 	# remove unneeded SYSTEM variable from Makefile, fixing bug #105730
-	cd ${S}
-	sed -i -e "s:\$(SYSTEM)::" Makefile
+	cd "${S}"
+	sed -i -e "s:\$(SYSTEM)::" Makefile || die "sed failed."
+	sed -i -e "s:install -c -s:install -c:" Makefile || die "sed failed."
+	sed -i -e "s:\$(DESTDIR)/man:\$(DESTDIR)/share/man:" \
+		Makefile || die "sed failed."
+
+	tc-export CC
 }
 
 src_install()
 {
-	dodir /usr/bin /usr/man/man1
-	make DESTDIR=${D}/usr install || die
+	dodir /usr/bin /usr/share/man/man1
+	emake DESTDIR="${D}"/usr install || die
 	cd .. && dodoc BUGS CHANGES HINTS README TODO || die
 }