summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-05 09:49:34 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-05 09:49:34 +0000
commit89f02a9fe8dc1e5d3706a46b112b1dd750256975 (patch)
treee10f63cfdd5b2f86cb2df4d5d1f41de01d1f5777
parentMade a DESTDIR patch and use that to fix installation on multilib systems. (M... (diff)
downloadgentoo-2-89f02a9fe8dc1e5d3706a46b112b1dd750256975.tar.gz
gentoo-2-89f02a9fe8dc1e5d3706a46b112b1dd750256975.tar.bz2
gentoo-2-89f02a9fe8dc1e5d3706a46b112b1dd750256975.zip
multilib fixups.
-rw-r--r--media-libs/freetype/ChangeLog6
-rw-r--r--media-libs/freetype/freetype-1.3.1-r4.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 7fec6d55fbbc..78a63bfaa5c7 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/freetype
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.54 2004/08/02 03:32:16 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.55 2004/10/05 09:49:34 eradicator Exp $
+
+ 05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ freetype-1.3.1-r4.ebuild:
+ multilib fixups.
01 Aug 2004; Tom Gall <tgall@gentoo.org> freetype-1.3.1-r4.ebuild:
stable on ppc64, bug #57583
diff --git a/media-libs/freetype/freetype-1.3.1-r4.ebuild b/media-libs/freetype/freetype-1.3.1-r4.ebuild
index bd56a7aaedd1..b49386773931 100644
--- a/media-libs/freetype/freetype-1.3.1-r4.ebuild
+++ b/media-libs/freetype/freetype-1.3.1-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r4.ebuild,v 1.6 2004/08/02 03:32:16 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r4.ebuild,v 1.7 2004/10/05 09:49:34 eradicator Exp $
# r3 change by me (danarmak): there's a contrib dir inside the freetype1
# sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner.
@@ -13,7 +13,7 @@
# When we update to freetype-pre1.4 or any later version, we should use
# the included contrib directory and not download any additional files.
-inherit gnuconfig
+inherit gnuconfig eutils
P2=${PN}1-contrib
DESCRIPTION="TTF-Library"
@@ -75,10 +75,10 @@ src_install() {
# Seems to require a shared libintl (getetxt comes only with a static one
# But it seems to work without problems
- make -f arch/unix/Makefile prefix=${D}/usr install || die
+ make -f arch/unix/Makefile prefix=${D}/usr libdir=${D}/usr/$(get_libdir) install || die
cd ${S}/po
- make prefix=${D}/usr install || die
+ make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) install || die
cd ${S}
dodoc announce PATENTS README readme.1st