Commit 74dafde6 authored by Brian Pepple's avatar Brian Pepple Committed by Johan Dahlin

reviewed by: Johan Dahlin

2008-01-01  Brian Pepple  <bpepple@fedoraproject.org>

	reviewed by: Johan Dahlin

	* src/Makefile.am (nautilus_extensiondir): 
	* configure.in (NAUTILUS_LIBDIR): Fetch nautilus
	extension dir from nautilus-extension.pc


svn path=/trunk/; revision=50
parent 182b3d01
2008-01-01 Brian Pepple <bpepple@fedoraproject.org>
reviewed by: Johan Dahlin
* src/Makefile.am (nautilus_extensiondir):
* configure.in (NAUTILUS_LIBDIR): Fetch nautilus
extension dir from nautilus-extension.pc
2008-01-11 Scott Tsai <scottt.tw@gmail.com>
reviewed by: Johan Dahlin
......
......@@ -22,6 +22,7 @@ AC_PROG_LIBTOOL
dnl Check for pkgconfig first
AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
dnl Give error and exit if we don't have pkgconfig
if test "x$HAVE_PKGCONFIG" = "xno"; then
......@@ -54,6 +55,12 @@ NAUTILUS_LIBDIR=`$PKG_CONFIG --variable=libdir libnautilus-extension`
AC_SUBST(NAUTILUS_LIBDIR)
AC_DEFINE_UNQUOTED(NAUTILUS_LIBDIR, "$NAUTILUS_LIBDIR", [Nautilus libdir])
dnl ---------------------------------
dnl Get nautilus extensions directory
dnl ---------------------------------
NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
AC_SUBST(NAUTILUS_EXTENSION_DIR)
AC_OUTPUT([
Makefile
nautilus-python.pc
......
......@@ -10,7 +10,7 @@ INCLUDES = \
-DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\"" \
$(PYTHON_INCLUDES)
nautilus_extensiondir=$(NAUTILUS_LIBDIR)/nautilus/extensions-1.0
nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
nautilus_extension_LTLIBRARIES = libnautilus-python.la
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment