summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-13 14:11:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 23:18:47 +0000
commit67a51cd20d67cd2259d9638fde006ca578e772a6 (patch)
treee8a8d591bef98e77a40fc2a1e4a644f96949aa1b /meta/recipes-devtools
parent7cc0db7c42ca4c193503181db9d48ed2b29d74c5 (diff)
downloadpoky-67a51cd20d67cd2259d9638fde006ca578e772a6.tar.gz
docbook-utils: Add check to not sed files twice
This comes about from the code configure code getting run multiple times on the same WORKDIR and re-sed'ing already modified files. (From OE-Core rev: 22510c756aa2b1b8d46f88ec08de47674a24d5c7) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb17
1 files changed, 10 insertions, 7 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 c2ccef3429..96459dc26f 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
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native" 8DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native"
9 9
10PR = "r1" 10PR = "r2"
11 11
12SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz" 12SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz"
13 13
@@ -18,12 +18,15 @@ inherit autotools native
18 18
19do_configure_prepend() { 19do_configure_prepend() {
20 # Fix hard-coded references to /etc/sgml 20 # Fix hard-coded references to /etc/sgml
21 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in 21 if [ ! -e ${WORKDIR}/.sed_done ]; then
22 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am 22 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in
23 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am 23 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am
24 24 sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am
25 # Point jw to the native sysroot catalog 25
26 sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' bin/jw.in 26 # Point jw to the native sysroot catalog
27 sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' bin/jw.in
28 touch ${WORKDIR}/.sed_done
29 fi
27} 30}
28 31
29do_install() { 32do_install() {