diff options
-rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index b59d33d14f..df0fdf679a 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc | |||
@@ -46,12 +46,12 @@ EXTRA_OECONF = "--disable-introspection \ | |||
46 | LEAD_SONAME = "libpango-1.0*" | 46 | LEAD_SONAME = "libpango-1.0*" |
47 | LIBV = "1.8.0" | 47 | LIBV = "1.8.0" |
48 | 48 | ||
49 | postinst_prologue() { | 49 | pango_postinst() { |
50 | if ! [ -e $D${sysconfdir}/pango ] ; then | 50 | if ! [ -e $D${sysconfdir}/pango ] ; then |
51 | mkdir -p $D${sysconfdir}/pango | 51 | mkdir -p $D${sysconfdir}/pango |
52 | fi | 52 | fi |
53 | 53 | ||
54 | if [ "x$D" != "x" ]; then | 54 | if [ -n "$D" ]; then |
55 | ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ | 55 | ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ |
56 | $D${libdir}/pango/${LIBV}/modules/*.so \ | 56 | $D${libdir}/pango/${LIBV}/modules/*.so \ |
57 | > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null | 57 | > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null |
@@ -61,6 +61,8 @@ if [ "x$D" != "x" ]; then | |||
61 | sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules | 61 | sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules |
62 | 62 | ||
63 | exit 0 | 63 | exit 0 |
64 | else | ||
65 | ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules | ||
64 | fi | 66 | fi |
65 | } | 67 | } |
66 | 68 | ||
@@ -79,11 +81,11 @@ do_install_append () { | |||
79 | 81 | ||
80 | 82 | ||
81 | python populate_packages_prepend () { | 83 | python populate_packages_prepend () { |
82 | prologue = d.getVar("postinst_prologue", True) | 84 | pango_postinst = d.getVar("pango_postinst", True) |
83 | 85 | ||
84 | modules_root = d.expand('${libdir}/pango/${LIBV}/modules') | 86 | modules_root = d.expand('${libdir}/pango/${LIBV}/modules') |
85 | 87 | ||
86 | do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') | 88 | do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst) |
87 | } | 89 | } |
88 | 90 | ||
89 | FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" | 91 | FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" |