--- a/net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild	Tue Oct 27 15:24:16 2009 +0100
+++ b/net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild	Fri Oct 30 04:04:54 2009 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild,v 1.2 2009/04/23 03:37:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild,v 1.1 2009/06/21 15:45:19 caleb Exp $
 
 inherit eutils
 
@@ -19,10 +19,10 @@
 
 src_install() {
 	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/${P}"
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
 
 	einfo "Correcting additional Erlang code path in scripts"
-	sed -i -e "s:\`dirname \$0\`\/..\/ebin:${targetdir}:g" scripts/* || die "sed failed"
+	sed -i -e "s:\`dirname \$0\`/rabbitmq-env:/usr/sbin/rabbitmq-env:g" scripts/* || die "sed failed"
 
 	einfo "Installing Erlang module to ${targetdir}"
 	dodir "${targetdir}"
@@ -30,12 +30,12 @@
 
 	einfo "Installing server scripts to /usr/sbin"
 	# Install server scripts to sbin
-	dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server
-	dosbin scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins
+	dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server \
+	    scripts/rabbitmq-server scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins
 
 	einfo "Installing rabbitmqctl to /usr/bin"
 	# Install control script to bin
-	dobin scripts/rabbitmq-env scripts/rabbitmqctl
+	dobin scripts/rabbitmqctl
 
 	# Docs
 	dodoc README