summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-11 05:27:57 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-11 05:27:57 +0000
commit627db02932e4045119f2e0148381ab5d070f598d (patch)
treec4126e103ec94c9da58c380ef4e90f66c3283c49 /media-libs
parentfix a small brain fart (diff)
downloadgentoo-2-627db02932e4045119f2e0148381ab5d070f598d.tar.gz
gentoo-2-627db02932e4045119f2e0148381ab5d070f598d.tar.bz2
gentoo-2-627db02932e4045119f2e0148381ab5d070f598d.zip
multilib fixes.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/freetype/ChangeLog6
-rw-r--r--media-libs/freetype/freetype-2.1.5-r1.ebuild6
-rw-r--r--media-libs/freetype/freetype-2.1.9.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 78a63bfaa5c7..6a9d21e1e18d 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.55 2004/10/05 09:49:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.56 2004/10/11 05:27:57 eradicator Exp $
+
+ 10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ freetype-2.1.5-r1.ebuild, freetype-2.1.9.ebuild:
+ multilib fixes.
05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
freetype-1.3.1-r4.ebuild:
diff --git a/media-libs/freetype/freetype-2.1.5-r1.ebuild b/media-libs/freetype/freetype-2.1.5-r1.ebuild
index 4a9a60ceb23b..ef3e7ded5162 100644
--- a/media-libs/freetype/freetype-2.1.5-r1.ebuild
+++ b/media-libs/freetype/freetype-2.1.5-r1.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-2.1.5-r1.ebuild,v 1.16 2004/09/22 19:30:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.5-r1.ebuild,v 1.17 2004/10/11 05:27:57 eradicator Exp $
inherit eutils flag-o-matic gnuconfig libtool
@@ -32,7 +32,7 @@ src_unpack() {
src_compile() {
use bindist || append-flags -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
- make setup CFG="--host=${CHOST} --prefix=/usr `use_with zlib`" unix || die
+ make setup CFG="--host=${CHOST} --prefix=/usr `use_with zlib` --libdir=/usr/$(get_libdir)" unix || die
emake || die
@@ -45,7 +45,7 @@ src_compile() {
}
src_install() {
- make prefix=${D}/usr install || die
+ einstall libdir="${D}/usr/$(get_libdir)" || die
dodoc ChangeLog README
dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO}
diff --git a/media-libs/freetype/freetype-2.1.9.ebuild b/media-libs/freetype/freetype-2.1.9.ebuild
index 3ffd2fb687cf..b10b92dba905 100644
--- a/media-libs/freetype/freetype-2.1.9.ebuild
+++ b/media-libs/freetype/freetype-2.1.9.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-2.1.9.ebuild,v 1.3 2004/09/22 19:30:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.9.ebuild,v 1.4 2004/10/11 05:27:57 eradicator Exp $
inherit eutils flag-o-matic gnuconfig libtool
@@ -40,7 +40,7 @@ src_compile() {
use bindist || append-flags "${CFLAGS} -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
- make setup CFG="--host=${CHOST} --prefix=/usr `use_with zlib`" unix || die
+ make setup CFG="--host=${CHOST} --prefix=/usr `use_with zlib` --libdir=/usr/$(get_libdir)" unix || die
emake || die
@@ -55,7 +55,7 @@ src_compile() {
src_install() {
# make prefix=${D}/usr install || die
- make DESTDIR=${D} install || die
+ make DESTDIR="${D}" install || die
dodoc ChangeLog README
dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO}