From 4d02b28f956664ae5da430d1650d66093ee54d6b Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Mon, 2 Aug 2010 15:26:55 +0200 Subject: [PATCH] [build] Fix make distcheck for the nautilus extension --- SparkleShare/Nautilus/Makefile.am | 2 +- build/m4/sparkleshare/nautilus-python.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SparkleShare/Nautilus/Makefile.am b/SparkleShare/Nautilus/Makefile.am index dedd2f6e..68b8772d 100644 --- a/SparkleShare/Nautilus/Makefile.am +++ b/SparkleShare/Nautilus/Makefile.am @@ -2,7 +2,7 @@ SOURCES = \ sparkleshare-nautilus-extension.py if NAUTILUS_EXTENSION_ENABLED -NAUTILUS_PYTHON_INSTALL_DIR=$(subst "$(NAUTILUS_LIBDIR)/","${libdir}/",$(NAUTILUS_PYTHON_DIR)) +NAUTILUS_PYTHON_INSTALL_DIR=$(subst $(NAUTILUS_PREFIX)/,${prefix}/,$(NAUTILUS_PYTHON_DIR)) extensiondir = $(NAUTILUS_PYTHON_INSTALL_DIR) extension_SCRIPTS = $(addprefix $(srcdir)/, $(SOURCES)) else diff --git a/build/m4/sparkleshare/nautilus-python.m4 b/build/m4/sparkleshare/nautilus-python.m4 index d7765330..1256f362 100644 --- a/build/m4/sparkleshare/nautilus-python.m4 +++ b/build/m4/sparkleshare/nautilus-python.m4 @@ -2,8 +2,8 @@ AC_DEFUN([SPARKLESHARE_NAUTILUS_PYTHON], [ PKG_CHECK_MODULES(NAUTILUS_PYTHON, nautilus-python, have_nautilus_python=yes, have_nautilus_python=no) if test "x$have_nautilus_python" = "xyes"; then - NAUTILUS_LIBDIR="`$PKG_CONFIG --variable=libdir nautilus-python`" - AC_SUBST(NAUTILUS_LIBDIR) + NAUTILUS_PREFIX="`$PKG_CONFIG --variable=prefix nautilus-python`" + AC_SUBST(NAUTILUS_PREFIX) NAUTILUS_PYTHON_DIR="`$PKG_CONFIG --variable=pythondir nautilus-python`" AC_SUBST(NAUTILUS_PYTHON_DIR) AM_CONDITIONAL(NAUTILUS_EXTENSION_ENABLED, true)