gnome-control-center r8413 - in trunk: . vfs-methods/fontilus vfs-methods/themus

[jensg svn gnome org]

Author: jensg
Date: Fri Jan 25 19:11:55 2008
New Revision: 8413
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8413&view=rev

Log:
2008-01-25  Jens Granseuer  <jensgr gmx net>

	Patch by: Damien Carberry <damien carberry sun com>

	* configure.in:
	* vfs-methods/fontilus/Makefile.am
	* vfs-methods/themus/Makefile.am: determine correct nautilus
	 extension dir via pkgconfig (#505364)


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/vfs-methods/fontilus/ChangeLog
   trunk/vfs-methods/fontilus/Makefile.am
   trunk/vfs-methods/themus/ChangeLog
   trunk/vfs-methods/themus/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jan 25 19:11:55 2008
@@ -258,6 +258,10 @@
   FONTILUS=fontilus
   AC_SUBST(THEMUS)
   AC_SUBST(FONTILUS)
+  # Determine the install dir for the nautilus extensions.
+  NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
+  AC_SUBST(NAUTILUSDIR)
+
 
   # update LIBS for $export_dynamic
   export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`

Modified: trunk/vfs-methods/fontilus/Makefile.am
==============================================================================
--- trunk/vfs-methods/fontilus/Makefile.am	(original)
+++ trunk/vfs-methods/fontilus/Makefile.am	Fri Jan 25 19:11:55 2008
@@ -19,7 +19,7 @@
 gnome_font_viewer_LDADD = $(FONT_VIEW_LIBS)
 gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
 
-nautilusdir = $(libdir)/nautilus/extensions-2.0
+nautilusdir = $(NAUTILUSDIR)
 nautilus_LTLIBRARIES = libnautilus-fontilus.la
 libnautilus_fontilus_la_LDFLAGS = -module -avoid-version -no-undefined \
   -export-symbols-regex 'nautilus_module_.*'

Modified: trunk/vfs-methods/themus/Makefile.am
==============================================================================
--- trunk/vfs-methods/themus/Makefile.am	(original)
+++ trunk/vfs-methods/themus/Makefile.am	Fri Jan 25 19:11:55 2008
@@ -13,7 +13,7 @@
 vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules
 vfsmodule_LTLIBRARIES = libtheme-method.la
 
-nautilusdir = $(libdir)/nautilus/extensions-2.0
+nautilusdir = $(NAUTILUSDIR)
 nautilus_LTLIBRARIES = libnautilus-themus.la
 
 libtheme_method_la_LDFLAGS = -module -avoid-version -no-undefined \