mbmerlin_0.8.1-2.bb: Don't overwrite a file staged by libx11.

If mbmerlin is staged, packages which use the x11.pc file will get one
that mbmerlin provides.

Signed-off-by: Graham Gower <graham.gower@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/mbmerlin/mbmerlin_0.8.1-2.bb b/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
index 5c3a93a..e5c582a 100644 (file)
--- a/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
+++ b/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 inherit pkgconfig gpe
 
@@ -19,3 +19,8 @@ CFLAGS += " -D_GNU_SOURCE"
 
 SRC_URI[md5sum] = "c379c781ac05d3b64228f48362aecaca"
 SRC_URI[sha256sum] = "d2a482d4b7bce5cc41bacddc8ef48ebd21fecbe6585b74036e432c030595b11f"
+
+do_install_prepend() {
+    # This package is not x11, this file should not be staged.
+    rm ${S}/build/x11.pc
+}