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

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

commit adf3ef3811c0a272b4eb3e53c9d50a16a3d89ec9
Author: Joaquim Rocha <jrocha igalia com>
Date:   Mon Jun 21 21:44:18 2010 +0200

    upnp: Rename plugin's XML with the ID name

 configure.ac                              |    1 +
 src/upnp/Makefile.am                      |    7 +++----
 src/upnp/{libgrlupnp.xml => grl-upnp.xml} |    0
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dcd7736..e502ceb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,6 +273,7 @@ then
 fi
 
 UPNP_PLUGIN_ID="grl-upnp"
+AC_SUBST(UPNP_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([UPNP_PLUGIN_ID], ["$UPNP_PLUGIN_ID"], [UPnP plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/upnp/Makefile.am b/src/upnp/Makefile.am
index 9c0014c..22a9eb7 100644
--- a/src/upnp/Makefile.am
+++ b/src/upnp/Makefile.am
@@ -33,11 +33,10 @@ endif
 libgrlupnp_la_SOURCES = grl-upnp.c grl-upnp.h
 
 libdir = $(GRL_PLUGINS_DIR)
+upnpxmldir	= $(GRL_PLUGINS_CONF_DIR)
+upnpxml_DATA	= $(UPNP_PLUGIN_ID).xml
 
-upnplibxmldir		= $(libdir)
-upnplibxml_DATA	= libgrlupnp.xml
-
-EXTRA_DIR = $(upnplibdata_DATA)
+EXTRA_DIR = $(upnpxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/upnp/libgrlupnp.xml b/src/upnp/grl-upnp.xml
similarity index 100%
rename from src/upnp/libgrlupnp.xml
rename to src/upnp/grl-upnp.xml