CVS: sylpheedclaws/plugins/vcalendar configure.ac,1.2.2.77,1.2.2.78

Update of /pack/anoncvs/sylpheedclaws/plugins/vcalendar
In directory sunsite.dk:/tmp/cvs-serv1595/vcalendar

Modified Files:
      Tag: gtk2
	configure.ac 
Log Message:
Fix bug #958 (Extra plugins define wrong SYLPHEED_CLAWS_PLUGINDIR when prefix is set)


Index: configure.ac
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/plugins/vcalendar/configure.ac,v
retrieving revision 1.2.2.77
retrieving revision 1.2.2.78
diff -u -d -r1.2.2.77 -r1.2.2.78
--- configure.ac	2006/05/21 18:47:05	1.2.2.77
+++ configure.ac	2006/05/30 16:43:04	1.2.2.78
@@ -42,15 +42,13 @@
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)
 if test -z $prefix || test "${prefix}" == "NONE" ; then
+  prefix=$( $PKG_CONFIG --variable=prefix sylpheed-claws )
   SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
 else
-  SYLPHEED_CLAWS_PLUGINDIR=${prefix}/lib/sylpheed-claws/plugins
+  SYLPHEED_CLAWS_PLUGINDIR='${libdir}/sylpheed-claws/plugins'
 fi
 AC_SUBST(SYLPHEED_CLAWS_PLUGINDIR)
 
-if test -z $prefix || test "${prefix}" == "NONE" ; then
-  prefix=$( $PKG_CONFIG --variable=prefix sylpheed-claws )
-fi
 localedir="${prefix}/share/locale"
 AC_ARG_WITH(localedir,
 	[  --with-localedir=DIR    Locale directory],


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]