summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2004-06-19 16:45:41 +0000
committerMarinus Schraal <foser@gentoo.org>2004-06-19 16:45:41 +0000
commita3395ace23ccc0215123e994ff82b5b650755f83 (patch)
treedc09814778ebc1474dfb5ebd28f3e171c18f5cba /media-libs/fontconfig
parentStable on sparc. (diff)
downloadgentoo-2-a3395ace23ccc0215123e994ff82b5b650755f83.tar.gz
gentoo-2-a3395ace23ccc0215123e994ff82b5b650755f83.tar.bz2
gentoo-2-a3395ace23ccc0215123e994ff82b5b650755f83.zip
use destdir
Diffstat (limited to 'media-libs/fontconfig')
-rw-r--r--media-libs/fontconfig/ChangeLog5
-rw-r--r--media-libs/fontconfig/fontconfig-2.2.2.ebuild13
2 files changed, 12 insertions, 6 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index aff7574a48d2..c42b821a5095 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/fontconfig
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.48 2004/06/03 05:05:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.49 2004/06/19 16:45:41 foser Exp $
+
+ 19 Jun 2004; foser <foser@gentoo.org> fontconfig-2.2.2.ebuild :
+ Build with DESTDIR to fix libtool problems (#50076)
*fontconfig-2.1-r1 (02 Jun 2004)
diff --git a/media-libs/fontconfig/fontconfig-2.2.2.ebuild b/media-libs/fontconfig/fontconfig-2.2.2.ebuild
index fc7e64c249aa..664337a757c4 100644
--- a/media-libs/fontconfig/fontconfig-2.2.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.2.ebuild,v 1.6 2004/06/11 12:58:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.2.ebuild,v 1.7 2004/06/19 16:45:41 foser Exp $
inherit eutils
@@ -19,6 +19,7 @@ DEPEND=">=sys-apps/sed-4
>=dev-libs/expat-1.95.3"
src_unpack() {
+
unpack ${A}
cd ${S}
@@ -35,15 +36,17 @@ src_unpack() {
# The date can be troublesome
sed -i "s:\`date\`::" configure
+
}
src_compile() {
+
[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
die "Dont compile fontconfig with ccc, it doesnt work very well"
# disable docs only disables docs generation (!)
econf --disable-docs \
- --with-docdir=${D}/usr/share/doc/${PF} \
+ --with-docdir=/usr/share/doc/${PF} \
--x-includes=/usr/X11R6/include \
--x-libraries=/usr/X11R6/lib \
--with-default-fonts=/usr/X11R6/lib/X11/fonts/Type1 || die
@@ -55,12 +58,12 @@ src_compile() {
# remove Luxi TTF fonts from the list, the Type1 are much better
sed -i "s:<dir>/usr/X11R6/lib/X11/fonts/TTF</dir>::" fonts.conf
+
}
src_install() {
- einstall confdir=${D}/etc/fonts \
- datadir=${D}/usr/share \
- docdir=${D}/usr/share/doc/${P} || die
+
+ make DESTDIR=${D} install || die
insinto /etc/fonts
doins ${S}/fonts.conf