[PATCH 08/30] vimeo: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 6f5c519..a119eef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -578,6 +578,7 @@ then
 fi
 
 VIMEO_PLUGIN_ID="grl-vimeo"
+AC_SUBST(VIMEO_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([VIMEO_PLUGIN_ID], ["$VIMEO_PLUGIN_ID"], [Vimeo plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/vimeo/Makefile.am b/src/vimeo/Makefile.am
index 6af8775..5026163 100644
--- a/src/vimeo/Makefile.am
+++ b/src/vimeo/Makefile.am
@@ -25,12 +25,10 @@ libgrlvimeo_la_SOURCES =	\
 	gvimeo.c		\
 	gvimeo.h
 
-libdir=$(GRL_PLUGINS_DIR)
+vimeoxmldir	= $(GRL_PLUGINS_CONF_DIR)
+vimeoxml_DATA	= $(VIMEO_PLUGIN_ID).xml
 
-vimeolibxmldir		= $(libdir)
-vimeolibxml_DATA	= libgrlvimeo.xml
-
-EXTRA_DIR = $(vimeolibdata_DATA)
+EXTRA_DIR = $(vimeoxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/vimeo/grl-vimeo.xml b/src/vimeo/grl-vimeo.xml
new file mode 100644
index 0000000..b80c9d9
--- /dev/null
+++ b/src/vimeo/grl-vimeo.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Vimeo</name>
+    <description>A plugin for searching Vimeo videos</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/vimeo/libgrlvimeo.xml b/src/vimeo/libgrlvimeo.xml
deleted file mode 100644
index b80c9d9..0000000
--- a/src/vimeo/libgrlvimeo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Vimeo</name>
-    <description>A plugin for searching Vimeo videos</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4