summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Gower <graham.gower@gmail.com>2010-11-30 16:54:52 +1030
committerKhem Raj <raj.khem@gmail.com>2010-12-02 11:20:17 -0800
commitf2108885117d8460c21bbc182f2fb2ce0dfda2ba (patch)
tree66c6f6ca4af871f5662590e36e960853de0c8342
parentd666a5f6b3fe1ed9c31cbc2b403471a44f6304af (diff)
downloadopenembedded-f2108885117d8460c21bbc182f2fb2ce0dfda2ba.tar.gz
openjade_1.3.2.bb: Install catalog with the correct path.
Openjade was doing the following: install-catalog: addition of /mnt/oe/tmp/work/x86_64-linux/openjade-native-1.3.2-r4/image/mnt/oe/tmp/sysroots/x86_64-linux/share/sgml/openjade-1.3.2/catalog in /mnt/oe/tmp/sysroots/x86_64-linux/etc/sgml/openjade-1.3.2.cat Which was causing lengthy errors like this one: http://tinderbox.openembedded.org/packages/1149296/ Now I get: install-catalog: addition of /mnt/oe/tmp/sysroots/x86_64-linux/share/sgml/openjade-1.3.2/catalog in /mnt/oe/tmp/sysroots/x86_64-linux/etc/sgml/openjade-1.3.2.cat Signed-off-by: Graham Gower <graham.gower@gmail.com> Acked-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/openjade/openjade_1.3.2.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes/openjade/openjade_1.3.2.bb b/recipes/openjade/openjade_1.3.2.bb
index a84e899d35..6c69173266 100644
--- a/recipes/openjade/openjade_1.3.2.bb
+++ b/recipes/openjade/openjade_1.3.2.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "OpenJade is a suite of tools for validating, \
processing, and applying DSSSL (Document Style Semantics and \
Specification Language) stylesheets to SGML and XML documents."
LICENSE = "BSD"
-PR = "r4"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
file://configure.patch \
file://autoconf.patch \
@@ -42,8 +42,11 @@ do_install_append () {
install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV}
install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV}
+ # The catalog must live in the sysroot and it must be there for
+ # install-catalog to do its thing.
+ install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}
install-catalog --add ${sysconfdir}/sgml/openjade-${PV}.cat \
- ${D}${datadir}/sgml/openjade-${PV}/catalog
+ ${datadir}/sgml/openjade-${PV}/catalog
install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
${sysconfdir}/sgml/openjade-${PV}.cat