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

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.

svn path=/trunk/; revision=2820

diff --git a/ChangeLog b/ChangeLog
index 99b93aeb1e3b2195e6109d267c183205f9fec976..ebfee6a213c6189e73eb022d14199cbd3fefbe2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2008-01-13  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * properties/Makefile.am:

diff --git a/configure.ac b/configure.ac
index afd29edc39b45856409e91ec8edb036fc441b3af..0b4a7653511954e4c6bade35f918b241027baf34 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -188,6 +188,8 @@ AC_ARG_ENABLE(nautilus,
 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)

diff --git a/properties/Makefile.am b/properties/Makefile.am
index a1e9d951121054ee2eff9ec1ca1c830dd4d1b8fb..69eec0c269e8602d54d1de6f601af71044e6b387 100644 (file)
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -21,7 +21,7 @@ endif
 
 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