diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2012-06-23 21:15:34 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-06-25 09:06:43 +0200 |
| commit | f900bd8be72ed5347abeba1b6636d476aa7061d8 (patch) | |
| tree | e4e2549590a8e66f6733aa7e8f2af6dd8f044e4c /meta-gnome | |
| parent | ba3173c5abeedb57409c0448b450d4bc30690188 (diff) | |
| download | meta-openembedded-contrib-f900bd8be72ed5347abeba1b6636d476aa7061d8.tar.gz | |
abiword: fix packaging after PACKAGES reorder
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword-2.5.inc | 1 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc index 67a5ef4bf9..9b5adcc747 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc +++ b/meta-gnome/recipes-gnome/abiword/abiword-2.5.inc @@ -55,6 +55,7 @@ do_configure() { do_install_append() { install -d ${D}${datadir}/pixmaps/ mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ + rmdir ${D}${datadir}/icons } PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates " diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb index 53a980eaa1..ba0b979091 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb @@ -2,7 +2,7 @@ require abiword-2.5.inc DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio" RCONFLICTS_${PN} = "abiword-embedded" -PR = "r3" +PR = "r4" SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \ file://autogen-common.sh \ @@ -58,6 +58,8 @@ python populate_packages_prepend () { bb.data.setVar('PACKAGES', ' '.join(packages), d) } -FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la" +# don't steal /usr/lib/libabiword-2.8.so from ${PN} +# in this case it's needed in ${PN} +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/abiword*.la ${libdir}/abiword-${SHRT_VER}/plugins/*.la ${libdir}/libabiword*.la" FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug" FILES_${PN}-doc += "${datadir}/abiword-*/readme*" |