[grilo-plugins] flickr: Rename plugin's XML with the ID name

[Joaquim Manuel Pereira Rocha <jrocha src gnome org>]

commit 712f3c1a7fe47c7ce64224d7c4ff47c96c3ea407
Author: Joaquim Rocha <jrocha igalia com>
Date:   Mon Jun 21 21:31:38 2010 +0200

    flickr: Rename plugin's XML with the ID name

 configure.ac                                    |    1 +
 src/flickr/Makefile.am                          |    7 +++----
 src/flickr/{libgrlflickr.xml => grl-flickr.xml} |    0
 3 files changed, 4 insertions(+), 4 deletions(-)
---
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..8589644 100644
--- a/src/flickr/Makefile.am
+++ b/src/flickr/Makefile.am
@@ -24,11 +24,10 @@ libgrlflickr_la_SOURCES =	\
 	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/libgrlflickr.xml b/src/flickr/grl-flickr.xml
similarity index 100%
rename from src/flickr/libgrlflickr.xml
rename to src/flickr/grl-flickr.xml