Patchwork sgml-common: Fix re-execution of the compile task

login
register
mail settings
Submitter Richard Purdie
Date April 16, 2012, 9:49 a.m.
Message ID <1334569785.16992.69.camel@ted>
Download mbox | patch
Permalink /patch/25917/
State Accepted
Commit c9dcfbd87d749baa0a4948738055193982aad26d
Headers show

Comments

Richard Purdie - April 16, 2012, 9:49 a.m.
The sed command run during do_compile isn't idempotent. This change fixes it
so that it is and the compile task can be re-executed.

[YOCTO #2194]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
index 63e0acd..27b1a48 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
+++ b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
@@ -26,7 +26,7 @@  inherit autotools
 
 do_compile_append() {
 	# install-catalog script contains hardcoded references to /etc/sgml
-	sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/install-catalog
+	sed -i -e 's|\([ "]\+\)/etc/sgml|\1${sysconfdir}/sgml|g' bin/install-catalog
 }
 
 FILES_sgml-common_append = " ${datadir}/sgml"