diff -r 615d1c4acc0c sys-libs/zlib/zlib-1.2.4.ebuild --- a/sys-libs/zlib/zlib-1.2.4.ebuild Fri Mar 19 20:21:11 2010 -0400 +++ b/sys-libs/zlib/zlib-1.2.4.ebuild Fri Mar 19 22:02:34 2010 -0400 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.4.ebuild,v 1.2 2010/03/19 02:23:53 vapier Exp $ -inherit eutils toolchain-funcs +inherit eutils multilib toolchain-funcs DESCRIPTION="Standard (de)compression library" HOMEPAGE="http://www.zlib.net/" @@ -34,9 +34,15 @@ tc-export AR CC RANLIB RC DLLWRAP case ${CHOST} in *-mingw*|mingw*) - emake -f win32/Makefile.gcc prefix=/usr || die + sed -e 's|@prefix@|/usr|g' \ + -e 's|@exec_prefix@|${prefix}|g' \ + -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ + -e 's|@includedir@|${prefix}/include|g' \ + -e 's|@VERSION@|'${PV}'|g' \ + zlib.pc.in > zlib.pc + emake -f win32/Makefile.gcc prefix=/usr STRIP=true || die ;; - *) # not an autoconf script, so cant use econf + *) # not an autoconf script, so can't use econf ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die emake || die ;; @@ -44,14 +50,21 @@ } src_install() { - emake install DESTDIR="${D}" || die - dodoc FAQ README ChangeLog doc/*.txt - case ${CHOST} in *-mingw*|mingw*) dobin zlib1.dll || die dolib libz.dll.a || die + + insinto /usr/include + doins zconf.h zlib.h || die + + insinto /usr/$(get_libdir)/pkgconfig + doins zlib.pc || die ;; - *) gen_usr_ldscript -a z ;; + *) + emake install DESTDIR="${D}" || die + gen_usr_ldscript -a z ;; esac + + dodoc FAQ README ChangeLog doc/*.txt || die }