[PATCH 16/30] podcasts: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 4386591..f95abfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -389,6 +389,7 @@ then
 fi
 
 PODCASTS_PLUGIN_ID="grl-podcasts"
+AC_SUBST(PODCASTS_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([PODCASTS_PLUGIN_ID], ["$PODCASTS_PLUGIN_ID"], [Podcasts plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/podcasts/Makefile.am b/src/podcasts/Makefile.am
index a4925b7..2fe184a 100644
--- a/src/podcasts/Makefile.am
+++ b/src/podcasts/Makefile.am
@@ -21,12 +21,10 @@ libgrlpodcasts_la_LIBADD =	\
 
 libgrlpodcasts_la_SOURCES = grl-podcasts.c grl-podcasts.h
 
-libdir=$(GRL_PLUGINS_DIR)
+podcastsxmldir		= $(GRL_PLUGINS_CONF_DIR)
+podcastsxml_DATA	= $(PODCASTS_PLUGIN_ID).xml
 
-podcastslibxmldir	= $(libdir)
-podcastslibxml_DATA	= libgrlpodcasts.xml
-
-EXTRA_DIR = $(podcastslibdata_DATA)
+EXTRA_DIR = $(podcastsxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/podcasts/grl-podcasts.xml b/src/podcasts/grl-podcasts.xml
new file mode 100644
index 0000000..1222f5c
--- /dev/null
+++ b/src/podcasts/grl-podcasts.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Podcasts</name>
+    <description>A plugin for browsing podcasts</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/podcasts/libgrlpodcasts.xml b/src/podcasts/libgrlpodcasts.xml
deleted file mode 100644
index 1222f5c..0000000
--- a/src/podcasts/libgrlpodcasts.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Podcasts</name>
-    <description>A plugin for browsing podcasts</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4