gnome-system-tools r4099 - in trunk: . src/shares/nautilus

[carlosg svn gnome org]

Author: carlosg
Date: Sun Jan 13 14:32:36 2008
New Revision: 4099
URL: http://svn.gnome.org/viewvc/gnome-system-tools?rev=4099&view=rev

Log:
2008-01-13  Carlos Garnacho  <carlosg gnome org>

        * configure.in, src/shares/nautilus/Makefile.am: get the nautilus
        extensions directory from the .pc file. Fixes #508804, Patch by
        Damien Carbery  <damien carbery sun com>


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/shares/nautilus/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 13 14:32:36 2008
@@ -256,6 +256,10 @@
 AC_SUBST(NAUTILUS_LIBS)
 AC_SUBST(NAUTILUS_CFLAGS)
 
+dnl Determine the install dir for nautilus extension.
+NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
+AC_SUBST(NAUTILUSDIR)
+
 dnl ===========================
 dnl END: NAUTILUS EXTENSION
 dnl ===========================

Modified: trunk/src/shares/nautilus/Makefile.am
==============================================================================
--- trunk/src/shares/nautilus/Makefile.am	(original)
+++ trunk/src/shares/nautilus/Makefile.am	Sun Jan 13 14:32:36 2008
@@ -4,8 +4,7 @@
 	-I$(top_srcdir)					\
 	-I$(top_builddir)
 
-# FIXME: get this from the .pc file
-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir=$(NAUTILUSDIR)
 
 nautilus_extension_LTLIBRARIES=libnautilus-gst-shares.la