[PATCH 24/30] lastfm-albumart: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 46d0c07..973d67a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,6 +234,7 @@ then
 fi
 
 LASTFM_ALBUMART_PLUGIN_ID="grl-lastfm-albumart"
+AC_SUBST(LASTFM_ALBUMART_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([LASTFM_ALBUMART_PLUGIN_ID], ["$LASTFM_ALBUMART_PLUGIN_ID"], [Last.fm album art plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/lastfm-albumart/Makefile.am b/src/lastfm-albumart/Makefile.am
index 43d58cd..46d2438 100644
--- a/src/lastfm-albumart/Makefile.am
+++ b/src/lastfm-albumart/Makefile.am
@@ -19,12 +19,10 @@ libgrllastfm_albumart_la_LIBADD =	\
 
 libgrllastfm_albumart_la_SOURCES = grl-lastfm-albumart.c grl-lastfm-albumart.h
 
-libdir=$(GRL_PLUGINS_DIR)
+lastfmalbumartxmldir	= $(GRL_PLUGINS_CONF_DIR)
+lastfmalbumartxml_DATA	= $(LASTFM_ALBUMART_PLUGIN_ID).xml
 
-lastfmalbumartlibxmldir		= $(libdir)
-lastfmalbumartlibxml_DATA	= libgrllastfm-albumart.xml
-
-EXTRA_DIR = $(lastfmalbumartlibdata_DATA)
+EXTRA_DIR = $(lastfmalbumartxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in	\
diff --git a/src/lastfm-albumart/grl-lastfm-albumart.xml b/src/lastfm-albumart/grl-lastfm-albumart.xml
new file mode 100644
index 0000000..f2b64dd
--- /dev/null
+++ b/src/lastfm-albumart/grl-lastfm-albumart.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Album art Provider from Last.FM</name>
+    <description>A plugin for getting album arts using Last.FM as backend</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/lastfm-albumart/libgrllastfm-albumart.xml b/src/lastfm-albumart/libgrllastfm-albumart.xml
deleted file mode 100644
index f2b64dd..0000000
--- a/src/lastfm-albumart/libgrllastfm-albumart.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Album art Provider from Last.FM</name>
-    <description>A plugin for getting album arts using Last.FM as backend</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4