[evolution-kolab: 5/9] EPlugin: installation path fixes

[Christian Hilberg <chilberg src gnome org>]

commit 6157448ca6c8af1ae0c530850be0ad174f50083c
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Feb 6 16:44:50 2012 +0100

    EPlugin: installation path fixes
    
    * install Kolab2 account editor plugin into correct
      location
    * fix the *eplug.xml file to use the @PLUGINDIR@
      variable for installation prefix (available now
      via the latest fixes to the build system)

 src/eplugin/Makefile.am               |    2 +-
 src/eplugin/org-gnome-kolab.eplug.xml |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/eplugin/Makefile.am b/src/eplugin/Makefile.am
index 8bc38e2..a8327f1 100644
--- a/src/eplugin/Makefile.am
+++ b/src/eplugin/Makefile.am
@@ -3,7 +3,7 @@
 plugin_DATA = \
 	org-gnome-kolab.eplug
 
-lib_LTLIBRARIES = \
+plugin_LTLIBRARIES = \
 	liborg-gnome-kolab.la
 
 liborg_gnome_kolab_la_SOURCES = \
diff --git a/src/eplugin/org-gnome-kolab.eplug.xml b/src/eplugin/org-gnome-kolab.eplug.xml
index 6209b46..0360592 100644
--- a/src/eplugin/org-gnome-kolab.eplug.xml
+++ b/src/eplugin/org-gnome-kolab.eplug.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <e-plugin-list>
-	<!-- TODO: define autotools plugin install variable @PLUGINDIR@ which holds /usr/lib/evolution/2.30/plugins -->
 	<e-plugin type="shlib"
-		  location="/usr/lib/evolution/2.30/plugins/liborg-gnome-kolab.so"
+		  location="@PLUGINDIR@/liborg-gnome-kolab.so"
 		  load-on-startup="true"
 		  id="org.gnome.evolution.plugin.kolab"
 		  name="Kolab"
@@ -12,7 +11,7 @@
 		<author name="Silvan M. Fin" email="silvan kernelconcepts de"/>
 
 		<description>Kolab2 Plugin</description>
-		
+
 		<hook class="org.gnome.evolution.addressbook.config:1.0">
 			<group target="source"
 			       id="com.novell.evolution.addressbook.config.accountEditor"
@@ -34,7 +33,7 @@
 			</group>
 		</hook>
 		<!-- TODO need at least one (dummy) hook? -->
-		
+
 		<!--
 
 		<hook class="org.gnome.evolution.plugin.kolab.mail.config:1.0">