summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 02:05:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 13:18:24 +0000
commitecee0e67f0fdf7d39b8d997a062bc77c7c1c609f (patch)
tree6eeb6ccf2cfc86fdd6be7c7b034b6257f99e7032
parent31211284610f1052772490143c803eb942acd8c1 (diff)
downloadpoky-ecee0e67f0fdf7d39b8d997a062bc77c7c1c609f.tar.gz
docbook-utils-native: Fix case where ${B} != ${S}
Fix out of tree builds by using full paths to source and built objects as appropriate. (From OE-Core rev: fb9885f0f89eef30275683510569bf0ae8463226) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb23
1 files changed, 12 insertions, 11 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 5e1384d588..78034dd987 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
@@ -22,12 +22,12 @@ inherit autotools native
22do_configure_prepend() { 22do_configure_prepend() {
23 # Fix hard-coded references to /etc/sgml 23 # Fix hard-coded references to /etc/sgml
24 if [ ! -e ${S}/.sed_done ]; then 24 if [ ! -e ${S}/.sed_done ]; then
25 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in 25 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/bin/jw.in
26 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am 26 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/doc/man/Makefile.am
27 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am 27 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/doc/HTML/Makefile.am
28 28
29 # Point jw to the native sysroot catalog 29 # Point jw to the native sysroot catalog
30 sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' bin/jw.in 30 sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' ${S}/bin/jw.in
31 touch ${S}/.sed_done 31 touch ${S}/.sed_done
32 fi 32 fi
33} 33}
@@ -44,14 +44,15 @@ do_install() {
44 ln -sf docbook2$doctype ${D}${bindir}/docbook-to-$doctype 44 ln -sf docbook2$doctype ${D}${bindir}/docbook-to-$doctype
45 done 45 done
46 46
47 install -m 0755 ${S}/bin/jw ${D}${bindir}/ 47 install -m 0755 ${B}/bin/jw ${D}${bindir}/
48 for i in backends/dvi backends/html backends/man \ 48 for i in ${S}/backends/dvi ${S}/backends/html ${B}/backends/man \
49 backends/pdf backends/ps backends/rtf backends/tex \ 49 ${S}/backends/pdf ${S}/backends/ps ${S}/backends/rtf ${S}/backends/tex \
50 backends/texi backends/txt frontends/docbook \ 50 ${B}/backends/texi ${S}/backends/txt ${B}/frontends/docbook \
51 helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \ 51 ${S}/helpers/docbook2man-spec.pl ${S}/helpers/docbook2texi-spec.pl \
52 docbook-utils.dsl 52 ${S}/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 ${S}/$i ${D}${datadir}/sgml/docbook/utils-${PV}/$i 55 install $i ${D}${datadir}/sgml/docbook/utils-${PV}/$i
56 done 56 done
57
57} 58}