[PATCH 28/30] filesystem: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 8cb0761..4707134 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,7 @@ then
 fi
 
 FILESYSTEM_PLUGIN_ID="grl-filesystem"
+AC_SUBST(FILESYSTEM_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([FILESYSTEM_PLUGIN_ID], ["$FILESYSTEM_PLUGIN_ID"], [Filesystem plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/filesystem/Makefile.am b/src/filesystem/Makefile.am
index e25c7fa..14ed8db 100644
--- a/src/filesystem/Makefile.am
+++ b/src/filesystem/Makefile.am
@@ -17,12 +17,10 @@ libgrlfilesystem_la_LIBADD =	\
 
 libgrlfilesystem_la_SOURCES = grl-filesystem.c grl-filesystem.h
 
-libdir=$(GRL_PLUGINS_DIR)
+filesystemxmldir	= $(GRL_PLUGINS_CONF_DIR)
+filesystemxml_DATA	= $(FILESYSTEM_PLUGIN_ID).xml
 
-filesystemlibxmldir	= $(libdir)
-filesystemlibxml_DATA	= libgrlfilesystem.xml
-
-EXTRA_DIR = $(filesystemlibdata_DATA)
+EXTRA_DIR = $(filesystemxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/filesystem/grl-filesystem.xml b/src/filesystem/grl-filesystem.xml
new file mode 100644
index 0000000..cfb9bc6
--- /dev/null
+++ b/src/filesystem/grl-filesystem.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Filesystem</name>
+    <description>A plugin for browsing the filesystem</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/filesystem/libgrlfilesystem.xml b/src/filesystem/libgrlfilesystem.xml
deleted file mode 100644
index cfb9bc6..0000000
--- a/src/filesystem/libgrlfilesystem.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Filesystem</name>
-    <description>A plugin for browsing the filesystem</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4