nautilus-cd-burner r2120 - in trunk: . src

[mccann svn gnome org]

Author: mccann
Date: Sun Jan 20 22:45:33 2008
New Revision: 2120
URL: http://svn.gnome.org/viewvc/nautilus-cd-burner?rev=2120&view=rev

Log:
2008-01-20  William Jon McCann  <mccann jhu edu>

	* configure.in:
	* src/Makefile.am:
	Use pkg-config to determine nautilus extension dir.
	Patch from: Damien Carbery <damien carbery sun com>
	Fixes #508807



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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 20 22:45:33 2008
@@ -105,6 +105,8 @@
  libnautilus-extension >= $NAUTILUS_REQUIRED dnl
  eel-2.0 >= $EEL_REQUIRED dnl
  $HAL)
+NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
+AC_SUBST(NAUTILUSDIR)
 
 PKG_CHECK_MODULES(BURN,
   glib-2.0 >= $GLIB_REQUIRED

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Jan 20 22:45:33 2008
@@ -120,7 +120,7 @@
 libmapping_la_LIBADD = $(MAPPING_LIBS)
 
 ### Nautilus Extension
-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir = $(NAUTILUSDIR)
 nautilus_extension_LTLIBRARIES = libnautilus-burn-extension.la
 
 libnautilus_burn_extension_la_SOURCES = 	\