Get the nautilus extension dir properly instead of using a hack. Fixe…

…s 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
donald · Jan 13, 2008 · 2c08eed · 2c08eed
1 parent 000eafd
commit 2c08eed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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