[PATCH 06/30] metadata-store: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 6d81f76..9d4ff2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -534,6 +534,7 @@ then
 fi
 
 METADATA_STORE_PLUGIN_ID="grl-metadata-store"
+AC_SUBST(METADATA_STORE_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([METADATA_STORE_PLUGIN_ID], ["$METADATA_STORE_PLUGIN_ID"], [Metadata Store plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/metadata-store/Makefile.am b/src/metadata-store/Makefile.am
index 4a51603..6bbdedd 100644
--- a/src/metadata-store/Makefile.am
+++ b/src/metadata-store/Makefile.am
@@ -17,12 +17,10 @@ libgrlmetadatastore_la_LIBADD =	\
 
 libgrlmetadatastore_la_SOURCES = grl-metadata-store.c grl-metadata-store.h
 
-libdir=$(GRL_PLUGINS_DIR)
+metadatastorexmldir	= $(GRL_PLUGINS_CONF_DIR)
+metadatastorexml_DATA	= $(METADATA_STORE_PLUGIN_ID).xml
 
-metadatastorelibxmldir		= $(libdir)
-metadatastorelibxml_DATA	= libgrlmetadatastore.xml
-
-EXTRA_DIR = $(metadatastorelibdata_DATA)
+EXTRA_DIR = $(metadatastorexml_DATA)
 
 MAINTAINERCLEANFILES	 = \
 	*.in \
diff --git a/src/metadata-store/grl-metadata-store.xml b/src/metadata-store/grl-metadata-store.xml
new file mode 100644
index 0000000..b8bbbb8
--- /dev/null
+++ b/src/metadata-store/grl-metadata-store.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Metadata Store</name>
+    <description>A plugin for storing extra metadata information</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/metadata-store/libgrlmetadatastore.xml b/src/metadata-store/libgrlmetadatastore.xml
deleted file mode 100644
index b8bbbb8..0000000
--- a/src/metadata-store/libgrlmetadatastore.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Metadata Store</name>
-    <description>A plugin for storing extra metadata information</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4