diff options
| author | Wouter Bolsterlee <wbolster@svn.gnome.org> | 2008-01-13 14:31:59 (GMT) |
|---|---|---|
| committer | Wouter Bolsterlee <wbolster@src.gnome.org> | 2008-01-13 14:31:59 (GMT) |
| commit | 2c08eeda6b9db68b504bbfb41459c214adad8dbd (patch) | |
| tree | 99a7446106bce235d7d8dbb1cd6edd25dc0cfbef | |
| parent | 000eafdee177fc61c61b0632eccf82d8643203a2 (diff) | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | properties/Makefile.am | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -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 afd29ed..0b4a765 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 a1e9d95..69eec0c 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 |