aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-02-17 13:30:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-18 01:16:26 +0000
commit6547f62fb3da7094fd9aa85c3777b17aa38700a3 (patch)
treee5520beea39fe6ea094096c1665d5185bcb13737
parent561c7a8f654871a8e738d24a2aeec556d6b52f8a (diff)
downloadopenembedded-core-contrib-6547f62fb3da7094fd9aa85c3777b17aa38700a3.tar.gz
openjade-native: Set datadir explicitly
datadir was previously defaulting to usr/share and hence could not find openjade's data files. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index f267fc54831..3615ec37212 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -7,7 +7,7 @@ SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
-PR = "r0"
+PR = "r1"
DEPENDS = "opensp-native sgml-common-native"
RDEPENDS_${PN} = "sgml-common"
@@ -23,6 +23,10 @@ inherit autotools native
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--enable-splibdir=${STAGING_LIBDIR}"
+# We need to set datadir explicitly, but adding it to EXTRA_OECONF
+# results in it being specified twice when configure is run.
+CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadir}', '--datadir=${STAGING_DATADIR}/sgml/openjade-${PV}')}"
+
CFLAGS =+ "-I${S}/include"
do_install() {