basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

1 files changed, 5 insertions, 4 deletions

diff --git a/meta-agl/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend b/meta-agl/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
index c4bebdc1..e8ce1ab7 100644
--- a/meta-agl/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
+++ b/meta-agl/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
@@ -1,16 +1,17 @@
-PACKAGES =+ "fontconfig-test"
-
 do_install_append() {
 	install -m 755 -d ${D}/${datadir}/fontconfig-test
 	install -m 755 ${S}/test/run-test.sh ${D}/${datadir}/fontconfig-test/
 
-	sed -i -e "s/FCLIST=\.\.\/fc\-list\/fc\-list/FCLIST=\/usr\/bin\/fc\-list/g" -e "s/FCCACHE=\.\.\/fc\-cache\/fc\-cache/FCCACHE=\/usr\/bin\/fc\-cache/g" ${D}/${datadir}/fontconfig-test/run-test.sh 
+	sed -i -e "s#^FCLIST=\.\./fc-list/fc-list#FCLIST=/usr/bin/fc-list#g" -e "s#^FCCACHE=\.\./fc-cache/fc-cache#FCCACHE=/usr/bin/fc-cache#g" ${D}/${datadir}/fontconfig-test/run-test.sh 
 
-	for x in 4x6.pcf 8x16.pcf out.expected fonts.conf.in; do
+	install -m 644 ${B}/test/out.expected ${D}/${datadir}/fontconfig-test/
+	for x in 4x6.pcf 8x16.pcf fonts.conf.in; do
 		install -m 644 ${S}/test/$x ${D}/${datadir}/fontconfig-test/
 	done
 }
 
+PACKAGES =+ "fontconfig-test"
+
 DEBIAN_NOAUTONAME_fontconfig-test = "1"
 FILES_fontconfig-test = "${datadir}/fontconfig-test/*"