From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Sep 2008 15:33:29 +0000 (+0000)
Subject: fennec: fix compile, do_install fails since fennec doesn't support 'direct installs'
X-Git-Tag: Release-2010-05/1~6141^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=752ba454e82fc8661964cdb3c0213381f35b796f;p=openembedded.git

fennec: fix compile, do_install fails since fennec doesn't support 'direct installs'
---

diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb
index 8faa26030c..b71cf9b8b3 100644
--- a/packages/mozilla/fennec_hg.bb
+++ b/packages/mozilla/fennec_hg.bb
@@ -13,9 +13,12 @@ S = "${WORKDIR}/mozilla-central"
 inherit mozilla
 require firefox.inc
 
+PARALLEL_MAKE = ""
 export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
+export LIBXUL_DIST="${S}/objdir/xulrunner/dist/"
+
 do_configure_prepend() {
 	if [ -e ${WORKDIR}/mobile-browser ] ; then
 		mv ${WORKDIR}/mobile-browser ${S}/mobile
@@ -28,6 +31,9 @@ do_compile_prepend() {
 	sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \
 	       -e  s:'$(OS_TEST)':${TARGET_ARCH}:g \
 	           ${S}/security/coreconf/Linux.mk
+
+	sed -i -e /LIBXUL_DIST/d ${S}/objdir/mobile/config/autoconf.mk
+	echo "LIBXUL_DIST=${S}/objdir/xulrunner/dist" >> ${S}/objdir/mobile/config/autoconf.mk
 }
 
 do_stage() {