[evince] Respect prefix when installing nautilus extensions



commit 44b9b196adc691c8f0c417437c1e646895289283
Author: Hib Eris <hib hiberis nl>
Date:   Thu Dec 15 22:17:21 2011 +0100

    Respect prefix when installing nautilus extensions
    
    Fixes bug #505359.

 configure.ac           |    4 +++-
 properties/Makefile.am |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4c45303..2ea0990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,7 +371,9 @@ if test "$enable_nautilus" = "yes" ; then
   PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
                     [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
   NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-  AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR])
+  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libnautilus-extension`}
+  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#/}
+  AC_SUBST(NAUTILUS_EXTENSION_DIR)
   AC_SUBST(NAUTILUS_CFLAGS)
   AC_SUBST(NAUTILUS_LIBS)
 
diff --git a/properties/Makefile.am b/properties/Makefile.am
index ecbb5d9..e59ef03 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -16,6 +16,7 @@ libevproperties_la_SOURCES=			\
 
 if ENABLE_NAUTILUS
 
+nautilusextensiondir=$(libdir)/$(NAUTILUS_EXTENSION_DIR)
 nautilusextension_LTLIBRARIES = libevince-properties-page.la
 
 libevince_properties_page_la_CFLAGS = -I$(top_srcdir)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]