2 files changed, 9 insertions, 19 deletions

diff --git a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
index b91e5fbfa7..03a1bc86c2 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
@@ -5,10 +5,8 @@ DEPENDS = "freetype-native expat-native zlib-native"
 EXTRA_OEMAKE = ""
 EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
 
-do_stage () {
-        oe_runmake install
-        install fc-lang/fc-lang ${STAGING_BINDIR}
-        install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
-        install -d ${STAGING_LIBDIR}/pkgconfig/
-        install -m 0644 fontconfig.pc ${STAGING_LIBDIR}/pkgconfig/
+do_install_append () {
+        install -d ${D}${bindir}/
+        install fc-lang/fc-lang ${D}${bindir}/
+        install fc-glyphname/fc-glyphname ${D}${bindir}/
 }
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb
index 3a26fd49b4..d9697432ed 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -21,7 +21,7 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
 
 PARALLEL_MAKE = ""
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 export HASDOCBOOK="no"
 
@@ -40,14 +40,6 @@ python do_unpack () {
        bb.build.exec_func('fontconfig_do_unpack', d)
 }
 
-do_stage () {
-        oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}/fontconfig
-        for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
-        install -d ${STAGING_LIBDIR}/pkgconfig/
-        install -m 0644 fontconfig.pc ${STAGING_LIBDIR}/pkgconfig/
-}
-
 BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
 
 do_configure_append () {
@@ -78,10 +70,10 @@ do_install () {
 }
 
 do_install_append() {
-        install -d ${D}/etc/default/volatiles
-        install -m 0644 ${WORKDIR}/97_fontconfig ${D}/etc/default/volatiles
-        rmdir ${D}/var/cache/fontconfig
-        rmdir ${D}/var/cache/
+        install -d ${D}${sysconfdir}/default/volatiles
+        install -m 0644 ${WORKDIR}/97_fontconfig ${D}${sysconfdir}/default/volatiles
+        rmdir ${D}${localstatedir}/cache/fontconfig
+        rmdir ${D}${localstatedir}/cache/
 }
 
 pkg_postinst_hal () {