[PATCH 10/30] gravatar: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index f6e53bd..03a6b45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -602,6 +602,7 @@ then
 fi
 
 GRAVATAR_PLUGIN_ID="grl-gravatar"
+AC_SUBST(GRAVATAR_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([GRAVATAR_PLUGIN_ID], ["$GRAVATAR_PLUGIN_ID"], [Gravatar plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/gravatar/Makefile.am b/src/gravatar/Makefile.am
index 4575db9..69fb29a 100644
--- a/src/gravatar/Makefile.am
+++ b/src/gravatar/Makefile.am
@@ -15,12 +15,10 @@ libgrlgravatar_la_LIBADD =	\
 
 libgrlgravatar_la_SOURCES = grl-gravatar.c grl-gravatar.h
 
-libdir=$(GRL_PLUGINS_DIR)
+gravatarxmldir		= $(GRL_PLUGINS_CONF_DIR)
+gravatarxml_DATA	= $(GRAVATAR_PLUGIN_ID).xml
 
-gravatarlibxmldir	= $(libdir)
-gravatarlibxml_DATA	= libgrlgravatar.xml
-
-EXTRA_DIR = $(gravatarlibdata_DATA)
+EXTRA_DIR = $(gravatarxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in	\
diff --git a/src/gravatar/grl-gravatar.xml b/src/gravatar/grl-gravatar.xml
new file mode 100644
index 0000000..58f60d1
--- /dev/null
+++ b/src/gravatar/grl-gravatar.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Avatar provider from Gravatar</name>
+    <description>A plugin to get avatars for artist and author fields</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/gravatar/libgrlgravatar.xml b/src/gravatar/libgrlgravatar.xml
deleted file mode 100644
index 58f60d1..0000000
--- a/src/gravatar/libgrlgravatar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Avatar provider from Gravatar</name>
-    <description>A plugin to get avatars for artist and author fields</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4