[PATCH 12/30] shoutcast: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

---
 configure.ac                      |    1 +
 src/shoutcast/Makefile.am         |    6 +++---
 src/shoutcast/grl-shoutcast.xml   |    9 +++++++++
 src/shoutcast/libgrlshoutcast.xml |    9 ---------
 4 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 src/shoutcast/grl-shoutcast.xml
 delete mode 100644 src/shoutcast/libgrlshoutcast.xml

diff --git a/configure.ac b/configure.ac
index bb66d26..af0b48f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,6 +465,7 @@ then
 fi
 
 SHOUTCAST_PLUGIN_ID="grl-shoutcast"
+AC_SUBST(SHOUTCAST_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([SHOUTCAST_PLUGIN_ID], ["$SHOUTCAST_PLUGIN_ID"], [Shoutcast plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/shoutcast/Makefile.am b/src/shoutcast/Makefile.am
index 7ab6de4..470b386 100644
--- a/src/shoutcast/Makefile.am
+++ b/src/shoutcast/Makefile.am
@@ -21,10 +21,10 @@ libgrlshoutcast_la_SOURCES	 = grl-shoutcast.c grl-shoutcast.h
 
 libdir=$(GRL_PLUGINS_DIR)
 
-shoutcastlibxmldir	= $(libdir)
-shoutcastlibxml_DATA	= libgrlshoutcast.xml
+shoutcastxmldir		= $(GRL_PLUGINS_CONF_DIR)
+shoutcastxml_DATA	= $(SHOUTCAST_PLUGIN_ID).xml
 
-EXTRA_DIR = $(shoutcastlibdata_DATA)
+EXTRA_DIR = $(shoutcastxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/shoutcast/grl-shoutcast.xml b/src/shoutcast/grl-shoutcast.xml
new file mode 100644
index 0000000..2f9e916
--- /dev/null
+++ b/src/shoutcast/grl-shoutcast.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>SHOUTcast</name>
+    <description>A plugin for browsing SHOUTcast radios</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/shoutcast/libgrlshoutcast.xml b/src/shoutcast/libgrlshoutcast.xml
deleted file mode 100644
index 2f9e916..0000000
--- a/src/shoutcast/libgrlshoutcast.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>SHOUTcast</name>
-    <description>A plugin for browsing SHOUTcast radios</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4