summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster/charm/charm-6.1.2.ebuild')
-rw-r--r--sys-cluster/charm/charm-6.1.2.ebuild14
1 files changed, 9 insertions, 5 deletions
diff --git a/sys-cluster/charm/charm-6.1.2.ebuild b/sys-cluster/charm/charm-6.1.2.ebuild
index 0864319..fd4422f 100644
--- a/sys-cluster/charm/charm-6.1.2.ebuild
+++ b/sys-cluster/charm/charm-6.1.2.ebuild
@@ -34,11 +34,6 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${P}-charmrun.patch"
- epatch "${FILESDIR}/${P}-charmc-gentoo.patch"
-
- sed -e "s|gentoo-include|${P}|" \
- -e "s|gentoo-libdir|$(get_libdir)|g" \
- -i ./src/scripts/charmc || die "failed patching charmc script"
# TCP instead of default UDP for socket comunication
# protocol
@@ -84,6 +79,15 @@ src_compile() {
}
src_install() {
+ # make charmc play well with gentoo before
+ # we move it into /usr/bin
+ epatch "${FILESDIR}/${P}-charmc-gentoo.patch"
+
+ sed -e "s|gentoo-include|${P}|" \
+ -e "s|gentoo-libdir|$(get_libdir)|g" \
+ -e "s|VERSION|${P}/VERSION|" \
+ -i ./src/scripts/charmc || die "failed patching charmc script"
+
# install binaries
cd "${S}"/bin
dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \