Skip to contentSkip to conversation

libxcb: fix repeated configures

PATCH New Ross Burton 1 participant 1 message Mar 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libxcb: fix repeated configures

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.

---
 meta/recipes-graphics/xcb/libxcb.inc |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-graphics/xcb/libxcb.inc +4 -4
index 5f4df69..124fe3d 100644
@@ -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
 }
Signature · 1 line
1.7.10.4