[PATCH 18/30] flickr: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 36bb32d..e7b277c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,6 +348,7 @@ then
 fi
 
 FLICKR_PLUGIN_ID="grl-flickr"
+AC_SUBST(FLICKR_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([FLICKR_PLUGIN_ID], ["$FLICKR_PLUGIN_ID"], [Flickr plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/flickr/Makefile.am b/src/flickr/Makefile.am
index 41e19e8..17c2ad4 100644
--- a/src/flickr/Makefile.am
+++ b/src/flickr/Makefile.am
@@ -23,12 +23,10 @@ libgrlflickr_la_SOURCES =	\
 	gflickr.c		\
 	gflickr.h
 
-libdir=$(GRL_PLUGINS_DIR)
+flickrxmldir	= $(GRL_PLUGINS_CONF_DIR)
+flickrxml_DATA	= $(FLICKR_PLUGIN_ID).xml
 
-flickrlibxmldir		= $(libdir)
-flickrlibxml_DATA	= libgrlflickr.xml
-
-EXTRA_DIR = $(flickrlibdata_DATA)
+EXTRA_DIR = $(flickrxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/flickr/grl-flickr.xml b/src/flickr/grl-flickr.xml
new file mode 100644
index 0000000..4b47f05
--- /dev/null
+++ b/src/flickr/grl-flickr.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Flickr</name>
+    <description>A plugin for browsing and searching Flickr photos</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/flickr/libgrlflickr.xml b/src/flickr/libgrlflickr.xml
deleted file mode 100644
index 4b47f05..0000000
--- a/src/flickr/libgrlflickr.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Flickr</name>
-    <description>A plugin for browsing and searching Flickr photos</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4