From: Wouter Bolsterlee Date: Sun, 13 Jan 2008 14:31:59 +0000 (+0000) Subject: Get the nautilus extension dir properly instead of using a hack. Fixes bug X-Git-Tag: EVINCE_2_21_90~50 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=2c08eeda6b9db68b504bbfb41459c214adad8dbd;p=evince.git Get the nautilus extension dir properly instead of using a hack. Fixes bug 2008-01-13 Wouter Bolsterlee * 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 99b93aeb..ebfee6a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-13 Wouter Bolsterlee + + * properties/Makefile.am: + + Get the nautilus extension dir properly instead of using + a hack. Fixes bug #505359. + 2008-01-13 Nickolay V. Shmyrev * properties/Makefile.am: diff --git a/configure.ac b/configure.ac index afd29edc..0b4a7653 100644 --- 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 a1e9d951..69eec0c2 100644 --- 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