[PATCH 26/30] jamendo: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

---
 configure.ac                  |    1 +
 src/jamendo/Makefile.am       |    8 +++-----
 src/jamendo/grl-jamendo.xml   |    9 +++++++++
 src/jamendo/libgrljamendo.xml |    9 ---------
 4 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 src/jamendo/grl-jamendo.xml
 delete mode 100644 src/jamendo/libgrljamendo.xml

diff --git a/configure.ac b/configure.ac
index 7e1babe..901a271 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,7 @@ then
 fi
 
 JAMENDO_PLUGIN_ID="grl-jamendo"
+AC_SUBST(JAMENDO_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([JAMENDO_PLUGIN_ID], ["$JAMENDO_PLUGIN_ID"], [Jamendo plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/jamendo/Makefile.am b/src/jamendo/Makefile.am
index a5e5750..dac143f 100644
--- a/src/jamendo/Makefile.am
+++ b/src/jamendo/Makefile.am
@@ -19,12 +19,10 @@ libgrljamendo_la_LIBADD =	\
 
 libgrljamendo_la_SOURCES	 = grl-jamendo.c grl-jamendo.h
 
-libdir=$(GRL_PLUGINS_DIR)
+jamendoxmldir	= $(GRL_PLUGINS_CONF_DIR)
+jamendoxml_DATA	= $(JAMENDO_PLUGIN_ID).xml
 
-jamendolibxmldir	= $(libdir)
-jamendolibxml_DATA	= libgrljamendo.xml
-
-EXTRA_DIR = $(jamendolibdata_DATA)
+EXTRA_DIR = $(jamendoxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/jamendo/grl-jamendo.xml b/src/jamendo/grl-jamendo.xml
new file mode 100644
index 0000000..e864cfe
--- /dev/null
+++ b/src/jamendo/grl-jamendo.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Jamendo</name>
+    <description>A plugin for browsing and searching Jamendo videos</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/jamendo/libgrljamendo.xml b/src/jamendo/libgrljamendo.xml
deleted file mode 100644
index e864cfe..0000000
--- a/src/jamendo/libgrljamendo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Jamendo</name>
-    <description>A plugin for browsing and searching Jamendo videos</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4