[gentoo-commits] proj/sci:master commit in: sys-apps/likwid/, sys-apps/likwid/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     d69a48d998c1353030585d6c17ee6377189bb508
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Wed Feb 19 00:47:41 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 00:47:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d69a48d9

switched to saner prefix for access daemon

---
 sys-apps/likwid/files/likwid-3.1.1-paths.patch | 2 +-
 sys-apps/likwid/likwid-3.1.1.ebuild            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-apps/likwid/files/likwid-3.1.1-paths.patch b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
index 202970e..a5d2824 100644
--- a/sys-apps/likwid/files/likwid-3.1.1-paths.patch
+++ b/sys-apps/likwid/files/likwid-3.1.1-paths.patch
@@ -12,7 +12,7 @@ diff -ru likwid-3.1.1/config.mk likwid-3.1.1-nju/config.mk
  # the absolute path to the msr daemon executable.
  # $(PREFIX)/bin/likwid-accessD
 -ACCESSDAEMON = $(PREFIX)/bin/likwid-accessD#NO SPACE
-+ACCESSDAEMON = /usr/bin/likwid-accessD#NO SPACE
++ACCESSDAEMON = PREFIX_MARKER/likwid-accessD#NO SPACE
  
  # Build the accessDaemon. Have a look in the WIKI for details.
  BUILDDAEMON = true#NO SPACE

diff --git a/sys-apps/likwid/likwid-3.1.1.ebuild b/sys-apps/likwid/likwid-3.1.1.ebuild
index b23bb71..d9876b2 100644
--- a/sys-apps/likwid/likwid-3.1.1.ebuild
+++ b/sys-apps/likwid/likwid-3.1.1.ebuild
@@ -18,6 +18,7 @@ IUSE=""
 src_prepare() {
 	epatch "${FILESDIR}/${P}-paths.patch"
 	epatch "${FILESDIR}/${P}-shared_lib.patch"
+	sed -i -e "s:PREFIX_MARKER:${EPREFIX}/usr/bin:" config.mk || die "Couldn't replace daemon dir!"
 	sed -i -e "s:/usr/local:${ED}/usr:" config.mk || die "Couldn't set prefix!"
 }