[PATCH 22/30] upnp: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

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..9f8b91c 100644
--- a/src/upnp/Makefile.am
+++ b/src/upnp/Makefile.am
@@ -32,12 +32,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/grl-upnp.xml b/src/upnp/grl-upnp.xml
new file mode 100644
index 0000000..3617b98
--- /dev/null
+++ b/src/upnp/grl-upnp.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>UPnP</name>
+    <description>A plugin for browsing UPnP servers</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/upnp/libgrlupnp.xml b/src/upnp/libgrlupnp.xml
deleted file mode 100644
index 3617b98..0000000
--- a/src/upnp/libgrlupnp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>UPnP</name>
-    <description>A plugin for browsing UPnP servers</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4