[PATCH 20/30] youtube: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 19ed182..19760fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,6 +314,7 @@ then
 fi
 
 YOUTUBE_PLUGIN_ID="grl-youtube"
+AC_SUBST(YOUTUBE_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([YOUTUBE_PLUGIN_ID], ["$YOUTUBE_PLUGIN_ID"], [YouTube plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/youtube/Makefile.am b/src/youtube/Makefile.am
index 03d828c..ddde095 100644
--- a/src/youtube/Makefile.am
+++ b/src/youtube/Makefile.am
@@ -21,12 +21,10 @@ libgrlyoutube_la_LIBADD =	\
 
 libgrlyoutube_la_SOURCES = grl-youtube.c grl-youtube.h
 
-libdir=$(GRL_PLUGINS_DIR)
+youtubexmldir	= $(GRL_PLUGINS_CONF_DIR)
+youtubexml_DATA	= $(YOUTUBE_PLUGIN_ID).xml
 
-youtubelibxmldir	= $(libdir)
-youtubelibxml_DATA	= libgrlyoutube.xml
-
-EXTRA_DIR = $(youtubelibdata_DATA)
+EXTRA_DIR = $(youtubexml_DATA)
 
 MAINTAINERCLEANFILES	 = \
 	*.in \
diff --git a/src/youtube/grl-youtube.xml b/src/youtube/grl-youtube.xml
new file mode 100644
index 0000000..b874678
--- /dev/null
+++ b/src/youtube/grl-youtube.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>YouTube</name>
+    <description>A plugin for browsing and searching Youtube videos</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/youtube/libgrlyoutube.xml b/src/youtube/libgrlyoutube.xml
deleted file mode 100644
index b874678..0000000
--- a/src/youtube/libgrlyoutube.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>YouTube</name>
-    <description>A plugin for browsing and searching Youtube videos</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4