6 files changed, 16 insertions, 21 deletions
diff --git a/packages/freetype/freetype-2.1.7/configure.patch b/packages/freetype/files/configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/freetype/freetype-2.1.7/configure.patch
+++ b/packages/freetype/files/configure.patch
diff --git a/packages/freetype/freetype-2.1.8/configure.patch b/packages/freetype/freetype-2.1.8/configure.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/freetype/freetype-2.1.8/configure.patch
+++ /dev/null
diff --git a/packages/freetype/freetype-native_2.1.7.bb b/packages/freetype/freetype-native_2.1.7.bb
index 7f0e7039df..dbebbef1ab 100644
--- a/packages/freetype/freetype-native_2.1.7.bb
+++ b/packages/freetype/freetype-native_2.1.7.bb
@@ -2,12 +2,14 @@ SECTION = "base"
 LICENSE = "freetype"
 DESCRIPTION = "Freetype font rendering library"
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
 
-inherit autotools pkgconfig native
+inherit autotools pkgconfig native binconfig
 DEPENDS = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/freetype-${PV}"
+FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
 S = "${WORKDIR}/freetype-${PV}"
 PACKAGES = ""
 
@@ -17,8 +19,6 @@ do_configure () {
 }
 
 do_stage () {
+	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-	cp -a ${S}/include/*.h ${STAGING_INCDIR}
-	install -d ${STAGING_INCDIR}/freetype2
-	cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
 }
diff --git a/packages/freetype/freetype-native_2.1.8.bb b/packages/freetype/freetype-native_2.1.8.bb
index 212e239e6e..b0bdb0fb38 100644
--- a/packages/freetype/freetype-native_2.1.8.bb
+++ b/packages/freetype/freetype-native_2.1.8.bb
@@ -2,12 +2,14 @@ SECTION = "libs"
 LICENSE = "freetype"
 DESCRIPTION = "Freetype font rendering library"
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1"
 
 inherit autotools pkgconfig native binconfig
 DEPENDS = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/freetype-${PV}"
+FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
 S = "${WORKDIR}/freetype-${PV}"
 PACKAGES = ""
 
@@ -17,8 +19,6 @@ do_configure () {
 }
 
 do_stage () {
+	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-	cp -a ${S}/include/*.h ${STAGING_INCDIR}
-	install -d ${STAGING_INCDIR}/freetype2
-	cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
 }
diff --git a/packages/freetype/freetype_2.1.7.bb b/packages/freetype/freetype_2.1.7.bb
index e043ee0f75..107c3dc142 100644
--- a/packages/freetype/freetype_2.1.7.bb
+++ b/packages/freetype/freetype_2.1.7.bb
@@ -2,13 +2,15 @@ SECTION = "libs"
 LICENSE = "freetype"
 DESCRIPTION = "Freetype font rendering library"
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += " ${bindir}"
 
-inherit autotools  pkgconfig
+inherit autotools binconfig pkgconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
@@ -23,12 +25,6 @@ do_configure () {
 }
 
 do_stage () {
+	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-
-	cp -a ${S}/include/*.h ${STAGING_INCDIR}
-	install -d ${STAGING_INCDIR}/freetype2
-	cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
-
-	sed -e 's,${prefix},${STAGING_LIBDIR}/..,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config
-	chmod u+x ${STAGING_BINDIR}/freetype-config
 }
diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb
index 2a2d101e37..f5b0dde110 100644
--- a/packages/freetype/freetype_2.1.8.bb
+++ b/packages/freetype/freetype_2.1.8.bb
@@ -2,6 +2,8 @@ SECTION = "libs"
 LICENSE = "freetype"
 DESCRIPTION = "Freetype font rendering library"
 
+PR = "r1"
+
 SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
 
@@ -23,9 +25,6 @@ do_configure () {
 }
 
 do_stage () {
+	autotools_stage_includes
 	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
-
-	cp -a ${S}/include/*.h ${STAGING_INCDIR}
-	install -d ${STAGING_INCDIR}/freetype2
-	cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
 }