Commit bfed5789 authored by Brian Pepple's avatar Brian Pepple Committed by Jürg Billeter

Get nautilus extension dir from nautilus-extension.pc

2007-12-24  Brian Pepple  <bpepple@fedoraproject.org>

	* configure.ac (NAUTILUS_LIBS): 
	* src/Makefile.am (nautilus_extensiondir): 

	Get nautilus extension dir from nautilus-extension.pc

svn path=/trunk/; revision=34
parent 8724845c
2007-12-24 Brian Pepple <bpepple@fedoraproject.org>
* configure.ac (NAUTILUS_LIBS):
* src/Makefile.am (nautilus_extensiondir):
Get nautilus extension dir from nautilus-extension.pc
2007-12-22 Jürg Billeter <j@bitron.ch>
* po/LINGUAS, po/pt_BR.po: Added Brazilian Portuguese translation by
......
......@@ -16,12 +16,13 @@ AC_SUBST(GETTEXT_PACKAGE)
AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL([0.35.0])
AC_PROG_LIBTOOL
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
NAUTILUS_REQUIRED=2.6.0
NAUTILUS_REQUIRED=2.12.0
GTK_REQUIRED=2.4.0
LIBGLADE_REQUIRED=2.4.0
GNOMEVFS_REQUIRED=2.6.0
......@@ -30,6 +31,12 @@ PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED gtk+-2.0
AC_SUBST(NAUTILUS_CFLAGS)
AC_SUBST(NAUTILUS_LIBS)
dnl -----------------------------------------------------------
dnl Use correct nautilus extensions directory
dnl -----------------------------------------------------------
NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
AC_SUBST(NAUTILUS_EXTENSION_DIR)
AC_CONFIG_FILES([Makefile
src/Makefile
po/Makefile.in])
......
......@@ -11,8 +11,7 @@ INCLUDES = \
$(DISABLE_DEPRECATED_CFLAGS) \
$(NAUTILUS_CFLAGS)
# FIXME: get this from the .pc file
nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
nautilus_extension_LTLIBRARIES=libnautilus-image-converter.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