summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-03-25 18:00:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-25 20:51:19 (GMT)
commitf36926a264190e6202830e8520b41b30ae77ea43 (patch)
tree9f8fa165df2c761abebee2f2109de9fa000900e7
parent18c888ddc4c9dd87eaf5f628785697b40384c4ba (diff)
downloadpoky-f36926a264190e6202830e8520b41b30ae77ea43.tar.gz
docbook-utils-native: Unbreak the build after source and build dir split
docbook-utils-native started to install frontends and backends in wrong locations after this change. The absolute build and source directories were being created in install locations and the recipes using docbook-utils-native were complaining like dbus-java is saying | jw: There is no frontend called "/b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/sgml/docbook/utils-0.6.14/frontends/docbook". | make: *** [CreateInterface.1] Error 2 | ERROR: oe_runmake failed Rightly so because now they are installed under /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/sgml/docbook/utils-0.6.14/b/kraj/jlinux-next/poky/build/tmp-eglibc/work/x86_64-linux/docbook-utils-native/0.6.14-r3/ This patch fixes the install to be like it was but consider the build and sourcedir split. (From OE-Core rev: d60aec3f5b319f4583fa72a8357b9ddd3be62b1a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb17
1 files changed, 11 insertions, 6 deletions
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
index 78034dd..c3a5f3b 100644
--- a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
+++ b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
@@ -45,14 +45,19 @@ do_install() {
45 done 45 done
46 46
47 install -m 0755 ${B}/bin/jw ${D}${bindir}/ 47 install -m 0755 ${B}/bin/jw ${D}${bindir}/
48 for i in ${S}/backends/dvi ${S}/backends/html ${B}/backends/man \ 48 for i in backends/dvi backends/html \
49 ${S}/backends/pdf ${S}/backends/ps ${S}/backends/rtf ${S}/backends/tex \ 49 backends/pdf backends/ps backends/rtf backends/tex \
50 ${B}/backends/texi ${S}/backends/txt ${B}/frontends/docbook \ 50 backends/txt \
51 ${S}/helpers/docbook2man-spec.pl ${S}/helpers/docbook2texi-spec.pl \ 51 helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \
52 ${S}/docbook-utils.dsl 52 docbook-utils.dsl
53 do 53 do
54 install -d ${D}${datadir}/sgml/docbook/utils-${PV}/`dirname $i` 54 install -d ${D}${datadir}/sgml/docbook/utils-${PV}/`dirname $i`
55 install $i ${D}${datadir}/sgml/docbook/utils-${PV}/$i 55 install ${S}/$i ${D}${datadir}/sgml/docbook/utils-${PV}/$i
56 done
57 for i in backends/man backends/texi frontends/docbook
58 do
59 install -d ${D}${datadir}/sgml/docbook/utils-${PV}/`dirname $i`
60 install ${B}/$i ${D}${datadir}/sgml/docbook/utils-${PV}/$i
56 done 61 done
57 62
58} 63}