evince r2820 - in trunk: . properties

[wbolster svn gnome org]

Author: wbolster
Date: Sun Jan 13 14:31:59 2008
New Revision: 2820
URL: http://svn.gnome.org/viewvc/evince?rev=2820&view=rev

Log:
2008-01-13  Wouter Bolsterlee  <wbolster svn gnome org>

	* properties/Makefile.am:

	Get the nautilus extension dir properly instead of using
	a hack. Fixes bug #505359.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/properties/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan 13 14:31:59 2008
@@ -188,6 +188,8 @@
 if test x$ENABLE_NAUTILUS = "xyes" ; then
 	PKG_CHECK_MODULES(NAUTILUS, gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension,
 			[HAVE_NAUTILUS=yes], [HAVE_NAUTILUS=no])
+	NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+	AC_SUBST(NAUTILUS_EXTENSION_DIR)
 fi
 
 AC_SUBST(NAUTILUS_CFLAGS)

Modified: trunk/properties/Makefile.am
==============================================================================
--- trunk/properties/Makefile.am	(original)
+++ trunk/properties/Makefile.am	Sun Jan 13 14:31:59 2008
@@ -21,7 +21,7 @@
 
 nautilus_LTLIBRARIES = $(EVINCE_PROPERTIES_PAGE)
 
-nautilusdir = $(libdir)/nautilus/extensions-2.0/
+nautilusdir=$(NAUTILUS_EXTENSION_DIR)
 libevince_properties_page_la_CFLAGS = -I$(top_srcdir)
 libevince_properties_page_la_SOURCES = 	\
 	ev-properties-main.c