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

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 0239b3a..174d859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,7 @@ then
 fi
 
 FAKEMETADATA_PLUGIN_ID="grl-fake-metadata"
+AC_SUBST(FAKEMETADATA_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([FAKEMETADATA_PLUGIN_ID], ["$FAKEMETADATA_PLUGIN_ID"], [Fake metadata plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/fake-metadata/Makefile.am b/src/fake-metadata/Makefile.am
index 004a16c..1656196 100644
--- a/src/fake-metadata/Makefile.am
+++ b/src/fake-metadata/Makefile.am
@@ -15,12 +15,10 @@ libgrlfakemetadata_la_LIBADD =	\
 
 libgrlfakemetadata_la_SOURCES = grl-fake-metadata.c grl-fake-metadata.h
 
-libdir=$(GRL_PLUGINS_DIR)
+fakemetadataxmldir	= $(GRL_PLUGINS_CONF_DIR)
+fakemetadataxml_DATA	= $(FAKEMETADATA_PLUGIN_ID).xml
 
-fakemetadatalibxmldir		= $(libdir)
-fakemetadatalibxml_DATA		= libgrlfakemetadata.xml
-
-EXTRA_DIR = $(fakemetadatalibdata_DATA)
+EXTRA_DIR = $(fakemetadataxml_DATA)
 
 MAINTAINERCLEANFILES	 = \
 	*.in \
diff --git a/src/fake-metadata/grl-fake-metadata.xml b/src/fake-metadata/grl-fake-metadata.xml
new file mode 100644
index 0000000..11e4d32
--- /dev/null
+++ b/src/fake-metadata/grl-fake-metadata.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Fake Metadata Provider</name>
+    <description>A plugin for faking metadata resolution</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/fake-metadata/libgrlfakemetadata.xml b/src/fake-metadata/libgrlfakemetadata.xml
deleted file mode 100644
index 11e4d32..0000000
--- a/src/fake-metadata/libgrlfakemetadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Fake Metadata Provider</name>
-    <description>A plugin for faking metadata resolution</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4