[PATCH 3/3] applet-trailers: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 6730fce..be13521 100644
--- a/configure.ac
+++ b/configure.ac
@@ -496,6 +496,7 @@ then
 fi
 
 APPLE_TRAILERS_PLUGIN_ID="grl-apple-trailers"
+AC_SUBST(APPLE_TRAILERS_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([APPLE_TRAILERS_PLUGIN_ID], ["$APPLE_TRAILERS_PLUGIN_ID"], [Apple Trailers plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/apple-trailers/Makefile.am b/src/apple-trailers/Makefile.am
index 9d8f506..4b5f34a 100644
--- a/src/apple-trailers/Makefile.am
+++ b/src/apple-trailers/Makefile.am
@@ -21,12 +21,10 @@ libgrlappletrailers_la_SOURCES =	\
 	grl-apple-trailers.c		\
 	grl-apple-trailers.h
 
-libdir=$(GRL_PLUGINS_DIR)
+appletrailersxmldir	= $(GRL_PLUGINS_CONF_DIR)
+appletrailersxml_DATA	= $(APPLE_TRAILERS_PLUGIN_ID).xml
 
-appletrailerslibxmldir		= $(libdir)
-appletrailerslibxml_DATA	= libgrlappletrailers.xml
-
-EXTRA_DIR = $(appletrailerslibdata_DATA)
+EXTRA_DIR = $(appletrailersxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/apple-trailers/grl-apple-trailers.xml b/src/apple-trailers/grl-apple-trailers.xml
new file mode 100644
index 0000000..9fd929a
--- /dev/null
+++ b/src/apple-trailers/grl-apple-trailers.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Apple Movie Trailers</name>
+    <description>A plugin for browsing Apple Movie Trailers</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/apple-trailers/libgrlappletrailers.xml b/src/apple-trailers/libgrlappletrailers.xml
deleted file mode 100644
index 9fd929a..0000000
--- a/src/apple-trailers/libgrlappletrailers.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Apple Movie Trailers</name>
-    <description>A plugin for browsing Apple Movie Trailers</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4