From cebdc67e53f825392de55a623dedb693433638c8 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 13 Dec 2003 01:28:28 +0000
Subject: Fix the fontconfig build.. had to add freetype-native for that to
 work well.

BKrev: 3fda6b3cujTT5_ygq34ooB3X1Bxraw
---
 freetype/freetype-native_2.1.7.oe | 0
 freetype/freetype_2.1.7.oe        | 6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 freetype/freetype-native_2.1.7.oe

(limited to 'freetype')

diff --git a/freetype/freetype-native_2.1.7.oe b/freetype/freetype-native_2.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe
index 59050f3733..780540331d 100644
--- a/freetype/freetype_2.1.7.oe
+++ b/freetype/freetype_2.1.7.oe
@@ -9,7 +9,8 @@ SRC_URI = ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 
 inherit autotools libtool pkgconfig
 
-EXTRA_OEMAKE="'LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool'"
+LIBTOOL=${S}/builds/unix/${HOST_SYS}-libtool
+EXTRA_OEMAKE="'LIBTOOL=${LIBTOOL}'"
 
 do_configure () {
 	cd builds/unix
@@ -26,7 +27,8 @@ do_stage () {
 
 	install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la
 	cp -a include/*.h ${STAGING_INCDIR}
-	cp -a include/freetype ${STAGING_INCDIR}
+	install -d ${STAGING_INCDIR}/freetype2
+	cp -a include/freetype ${STAGING_INCDIR}/freetype2/
 
 	sed -e 's,/usr,${STAGING_DIR}/target,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config
 	chmod u+x ${STAGING_BINDIR}/freetype-config
-- 
cgit v1.2.3