summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2012-01-30 22:27:35 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2012-01-30 22:27:35 +0100
commitd9961665cb2b9dd1324fd4d5c73df7c8b1e57549 (patch)
treec91421c51a5029315d200255c4b4ccc5243a0b2e
parentDrop mesa ebuild (diff)
downloadbenf-d9961665cb2b9dd1324fd4d5c73df7c8b1e57549.tar.gz
benf-d9961665cb2b9dd1324fd4d5c73df7c8b1e57549.tar.bz2
benf-d9961665cb2b9dd1324fd4d5c73df7c8b1e57549.zip
weston: Fix noinst->bin substitition
Since commit a97eca95d0b53255dfacab26984671a4b4109dbc terminal is installed globally, so our substution overwrote the real bin_PROGRAMS. So append instead. Reported by dolphingling in #wayland.
-rw-r--r--media-misc/weston/Manifest2
-rw-r--r--media-misc/weston/weston-9999.ebuild4
2 files changed, 3 insertions, 3 deletions
diff --git a/media-misc/weston/Manifest b/media-misc/weston/Manifest
index fbfe028..df2f227 100644
--- a/media-misc/weston/Manifest
+++ b/media-misc/weston/Manifest
@@ -1 +1 @@
-EBUILD weston-9999.ebuild 1823 RMD160 d1c9302a79fcf250739ef224a0a27fc4504a6f44 SHA1 309adceeb3291ed399406b933dba679d807ac7b4 SHA256 de75aea65e536b37f4c625cc7bc3cba8f358167f95dd3723cded03bcfa3f04b0
+EBUILD weston-9999.ebuild 1829 RMD160 be0639cdd98da587b078a362a356344b301a9562 SHA1 69ba559b7a74f028a5d7e169ccc526a73dcd1702 SHA256 bf0997ff5c664fd4a440bc5612b3d76624fc323647d619b5884b5479543cba93
diff --git a/media-misc/weston/weston-9999.ebuild b/media-misc/weston/weston-9999.ebuild
index a9e4d7d..c4596a6 100644
--- a/media-misc/weston/weston-9999.ebuild
+++ b/media-misc/weston/weston-9999.ebuild
@@ -67,8 +67,8 @@ myeconfargs=(
src_prepare()
{
- sed -i -e "/PROGRAMS/s/noinst/bin/" \
+ sed -i -e "s/noinst_PROGRAMS =/bin_PROGRAMS +=/" \
{src,clients}"/Makefile.am" || \
- die "sed {compositor,clients}/Makefile.am failed!"
+ die "sed {src,clients}/Makefile.am failed!"
eautoreconf
}