From 6547f62fb3da7094fd9aa85c3777b17aa38700a3 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Thu, 17 Feb 2011 13:30:14 -0800 Subject: 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 --- meta/recipes-devtools/openjade/openjade-native_1.3.2.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/openjade') 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 f267fc5..3615ec3 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() { -- cgit v1.1