aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorKoen Kooi <k-kooi@ti.com>2010-03-31 13:17:58 +0200
committerKoen Kooi <koen@openembedded.org>2010-04-12 19:43:31 +0200
commite1599e0096803726435e8316276c6550e24ec5c9 (patch)
tree098cc08df27b262454f9c97d3084f92365e7ece8 /recipes
parent71e455d118e51097179ef65031fe5f8d48ed56fa (diff)
downloadopenembedded-e1599e0096803726435e8316276c6550e24ec5c9.tar.gz
arora-e: try a bit harder to be parallel installable with arora-x11
Diffstat (limited to 'recipes')
-rw-r--r--recipes/webkit/arora.inc14
1 files changed, 12 insertions, 2 deletions
diff --git a/recipes/webkit/arora.inc b/recipes/webkit/arora.inc
index 597dc5102c..83bc2c1f57 100644
--- a/recipes/webkit/arora.inc
+++ b/recipes/webkit/arora.inc
@@ -2,12 +2,14 @@ DESCRIPTION = "Arora is a lightweight cross-platform web browser"
LICENE = "GPLv2"
HOMEPAGE = "http://code.google.com/p/arora/"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://arora.googlecode.com/files/arora-${PV}.tar.gz;name=arora"
S = "${WORKDIR}/arora-${PV}"
+export QT_LIBINFIX
+
do_configure_prepend() {
sed -i -e s:lrelease-qt4:${OE_QMAKE_LRELEASE}:g ${S}/src/locale/locale.pri
}
@@ -38,8 +40,16 @@ do_install() {
cp -r ${D}/${D}/* ${D}/ || true
cp -r ${D}/usr/local/* ${D}${prefix} || true
rm -rf ${D}/usr/local ${D}/${D}
+
+ if [ "$QT_LIBINFIX" = "E" ] ; then
+ mv ${D}${bindir}/arora ${D}${bindir}/aroraE
+ fi
+
}
-FILES_${PN} += "${datadir}/arora ${datadir}/gnome-control-center ${datadir}/icons"
+PACKAGES =+ "arora-data"
+FILES_arora-data += "${datadir}/pixmaps ${datadir}/applications ${datadir}/arora ${datadir}/gnome-control-center ${datadir}/icons"
+
+RDEPENDS_${PN} += "arora-data"