Patchwork libxcb: fix repeated configures

login
register
mail settings
Submitter Ross Burton
Date March 25, 2013, 2:03 p.m.
Message ID <1364220193-18076-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/46853/
State Accepted
Commit 659aadbd290d4f021f822415232e12f3462650c6
Headers show

Comments

Ross Burton - March 25, 2013, 2:03 p.m.
If configure is re-ran on an existing build tree the string substitutions we
need are done twice, resulting in invalid paths.  Anchor the expressions so they
only match a pristine configure.ac.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xcb/libxcb.inc |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc
index 5f4df69..124fe3d 100644
--- a/meta/recipes-graphics/xcb/libxcb.inc
+++ b/meta/recipes-graphics/xcb/libxcb.inc
@@ -51,12 +51,12 @@  FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
 
 inherit autotools pkgconfig pythonnative
 
-# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto`
+# XCBPROTO_XCBINCLUDEDIR is set based on `pkg-config --variable=xcbincludedir xcb-proto`
 # but the xcbincludedir variable doesn't point into the staging area, so it needs some
-# tweeking here:
+# tweaking here:
 do_configure_prepend () {
-    sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/|" \
+    sed -i "s|XCBPROTO_XCBINCLUDEDIR=\`|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/\`|" \
         ${S}/configure.ac
-    sed -i "s|XCBPROTO_XCBPYTHONDIR=|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/|" \
+    sed -i "s|XCBPROTO_XCBPYTHONDIR=\`|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/\`|" \
         ${S}/configure.ac
 }