[banshee] Fixup paths in banshee loader scripts

[Gabriel Burt <gburt src gnome org>]

commit a387691fc84ac0259cffcc321b659b0182de66b1
Author: Chow Loong Jin <hyperair ubuntu com>
Date:   Mon Mar 14 22:56:12 2011 +0800

    Fixup paths in banshee loader scripts
    
    Signed-off-by: Gabriel Burt <gabriel burt gmail com>

 src/Clients/Booter/banshee.darwin.in |    4 ++--
 src/Clients/Booter/banshee.linux.in  |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/Clients/Booter/banshee.darwin.in b/src/Clients/Booter/banshee.darwin.in
index e07a1f1..d4b3c0a 100644
--- a/src/Clients/Booter/banshee.darwin.in
+++ b/src/Clients/Booter/banshee.darwin.in
@@ -32,13 +32,13 @@ export GDK_PIXBUF_MODULE_FILE="$ETC_DIR/gtk-2.0/gdk-pixbuf.loaders"
 export PANGO_RC_FILE="$ETC_DIR/pango/pangorc"
 
 # Banshee/Mono/GStreamer environment
-export DYLD_LIBRARY_PATH="$LIB_DIR:$LIB_DIR/banshee-1:$LIB_DIR/banshee-1/Extensions"
+export DYLD_LIBRARY_PATH="$LIB_DIR:$LIB_DIR/@PACKAGE@:$LIB_DIR/@PACKAGE@/Extensions"
 export GST_PLUGIN_SYSTEM_PATH="$LIB_DIR/gstreamer-0.10"
 export BANSHEE_CONFIG_DIR="$XDG_CONFIG_HOME/banshee-1"
 BANSHEE_OPTIONS=""
 BANSHEE_EXEC_NAME=Banshee
 MONO_BIN="$BIN_DIR/mono"
-MONO_EXE="$LIB_DIR/banshee-1/Nereid.exe"
+MONO_EXE="$LIB_DIR/@PACKAGE@/Nereid.exe"
 MONO_OPTIONS=""
 
 # We are testing the SGen compacting GC
diff --git a/src/Clients/Booter/banshee.linux.in b/src/Clients/Booter/banshee.linux.in
index 0765878..38db80a 100644
--- a/src/Clients/Booter/banshee.linux.in
+++ b/src/Clients/Booter/banshee.linux.in
@@ -14,7 +14,6 @@ if [ $BANSHEE_EXEC_NAME = "muinshee" ]; then
     export MONO_PATH= expanded_libdir@/@PACKAGE@/Extensions
 fi
 
-[ ${BANSHEE_EXEC_NAME%%-1} = "banshee" ] && BANSHEE_EXEC_NAME="banshee-1"
 [ -n "$BANSHEE_DEBUG" -o -f "${BANSHEE_CONFIG_DIR}/always-debug" ] && BANSHEE_DEBUG="--debug"
 [ -n "$BANSHEE_TRACE" ] && BANSHEE_TRACE="--trace=$BANSHEE_TRACE"
 [ -n "$BANSHEE_PROFILE" ] && BANSHEE_PROFILE="--profile=$BANSHEE_PROFILE"