From fc4000bdaf2c9577dff27fc25ac235f2a8b889e4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 21 Jul 2010 02:57:02 +0200
Subject: [PATCH] mame: rename $ADDON_NAME to $ADDON_ID

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/emulators/mame/build           | 18 ++++++++++--------
 packages/addons/emulators/mame/install         | 10 +++++-----
 .../addons/emulators/mame/scripts/addon.xml    |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/addons/emulators/mame/build b/packages/addons/emulators/mame/build
index 4fa5da8945..da93b81764 100755
--- a/packages/addons/emulators/mame/build
+++ b/packages/addons/emulators/mame/build
@@ -7,7 +7,7 @@ $SCRIPTS/build SDL
 $SCRIPTS/build expat
 $SCRIPTS/build zlib
 
-ADDON_NAME="plugin.emulators.$1"
+ADDON_ID="addon.emulators.$1"
 ADDON_VERSION="2"
 
 PKG_DIR=`find $ROOT/$PACKAGES -type d -name $1`
@@ -64,13 +64,15 @@ cd $PKG_BUILD
        $ARCH_OPTS \
        $DEBUG_OPTS
 
-mkdir -p .addons/$ADDON_NAME
-  cp -R $PKG_DIR/scripts/* .addons/$ADDON_NAME
-  $SED "s|@ADDON_VERSION@|$OS_VERSION.$ADDON_VERSION|g" -i .addons/$ADDON_NAME/addon.xml
-  cp $PKG_DIR/config/mame.ini .addons/$ADDON_NAME
+mkdir -p .addons/$ADDON_ID
+  cp -R $PKG_DIR/scripts/* .addons/$ADDON_ID
+  $SED "s|@ADDON_VERSION@|$OS_VERSION.$ADDON_VERSION|g" -i .addons/$ADDON_ID/addon.xml
+  $SED "s|@ADDON_ID@|$ADDON_ID|g" -i .addons/$ADDON_ID/addon.xml
 
-mkdir -p .addons/$ADDON_NAME/bin
-  cp mame .addons/$ADDON_NAME/bin
+  cp $PKG_DIR/config/mame.ini .addons/$ADDON_ID
+
+mkdir -p .addons/$ADDON_ID/bin
+  cp mame .addons/$ADDON_ID/bin
 
 cd .addons
-  zip -rq $ADDON_NAME-$OS_VERSION.$ADDON_VERSION.zip $ADDON_NAME
+  zip -rq $ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $ADDON_ID
diff --git a/packages/addons/emulators/mame/install b/packages/addons/emulators/mame/install
index 483fb217d1..ea7ae0f298 100755
--- a/packages/addons/emulators/mame/install
+++ b/packages/addons/emulators/mame/install
@@ -2,14 +2,14 @@
 
 . config/options
 
-ADDON_NAME="plugin.emulators.$1"
+ADDON_ID="addon.emulators.$1"
 ADDON_VERSION="2"
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 if [ "$2" = addons ]; then
-  mkdir -p $TARGET_ADDONS/$ADDON_NAME
-    cp $PKG_BUILD/.addons/$ADDON_NAME-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_NAME
-    cp $PKG_DIR/scripts/changelog.txt $TARGET_ADDONS/$ADDON_NAME/changelog-$OS_VERSION.$ADDON_VERSION.txt
-    cp $PKG_DIR/scripts/icon.png $TARGET_ADDONS/$ADDON_NAME/icon.png
+  mkdir -p $TARGET_ADDONS/$ADDON_ID
+    cp $PKG_BUILD/.addons/$ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_ID
+    cp $PKG_DIR/scripts/changelog.txt $TARGET_ADDONS/$ADDON_ID/changelog-$OS_VERSION.$ADDON_VERSION.txt
+    cp $PKG_DIR/scripts/icon.png $TARGET_ADDONS/$ADDON_ID/icon.png
 fi
\ No newline at end of file
diff --git a/packages/addons/emulators/mame/scripts/addon.xml b/packages/addons/emulators/mame/scripts/addon.xml
index 5dc8dd82a8..cf4d311595 100644
--- a/packages/addons/emulators/mame/scripts/addon.xml
+++ b/packages/addons/emulators/mame/scripts/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.emulators.mame"
+<addon id="@ADDON_ID@"
        name="(Emulator) Multiple Arcade Machine Emulator"
        version="@ADDON_VERSION@"
        provider-name="openelec.tv">