[PATCH 14/30] bookmarks: Rename plugin's XML with the ID name

[Joaquim Rocha <jrocha igalia com>]

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

diff --git a/configure.ac b/configure.ac
index 201e293..6796254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -431,6 +431,7 @@ then
 fi
 
 BOOKMARKS_PLUGIN_ID="grl-bookmarks"
+AC_SUBST(BOOKMARKS_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([BOOKMARKS_PLUGIN_ID], ["$BOOKMARKS_PLUGIN_ID"], [Bookmarks plugin ID])
 
 # ----------------------------------------------------------
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 4d49666..c3e858a 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -17,12 +17,10 @@ libgrlbookmarks_la_LIBADD =	\
 
 libgrlbookmarks_la_SOURCES = grl-bookmarks.c grl-bookmarks.h
 
-libdir=$(GRL_PLUGINS_DIR)
+bookmarksxmldir		= $(GRL_PLUGINS_CONF_DIR)
+bookmarksxml_DATA	= $(BOOKMARKS_PLUGIN_ID).xml
 
-bookmarkslibxmldir	= $(libdir)
-bookmarkslibxml_DATA	= libgrlbookmarks.xml
-
-EXTRA_DIR = $(bookmarkslibdata_DATA)
+EXTRA_DIR = $(bookmarksxml_DATA)
 
 MAINTAINERCLEANFILES =	\
 	*.in		\
diff --git a/src/bookmarks/grl-bookmarks.xml b/src/bookmarks/grl-bookmarks.xml
new file mode 100644
index 0000000..74ef3ee
--- /dev/null
+++ b/src/bookmarks/grl-bookmarks.xml
@@ -0,0 +1,9 @@
+<plugin>
+  <info>
+    <name>Bookmarks</name>
+    <description>A plugin for organizing media bookmarks</description>
+    <author>Igalia S.L.</author>
+    <license>LGPL</license>
+    <site>http://www.igalia.com</site>
+  </info>
+</plugin>
diff --git a/src/bookmarks/libgrlbookmarks.xml b/src/bookmarks/libgrlbookmarks.xml
deleted file mode 100644
index 74ef3ee..0000000
--- a/src/bookmarks/libgrlbookmarks.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<plugin>
-  <info>
-    <name>Bookmarks</name>
-    <description>A plugin for organizing media bookmarks</description>
-    <author>Igalia S.L.</author>
-    <license>LGPL</license>
-    <site>http://www.igalia.com</site>
-  </info>
-</plugin>
-- 
1.7.0.4