From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 16 Apr 2012 09:49:45 +0000 (+0100)
Subject: sgml-common: Fix re-execution of the compile task
X-Git-Tag: 2015-4~10970
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c9dcfbd87d749baa0a4948738055193982aad26d;p=openembedded-core.git

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

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>
---

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 63e0acdba7..27b1a48ebd 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"