[gnome-color-manager/gnome-3-0] Use plugindir from gnome-settings-daemon pkg-config file



commit 17d084081d14293f0720f2f0c3bf9fe3386495b0
Author: Frederic Crozat <fcrozat novell com>
Date:   Thu Mar 10 14:27:47 2011 +0100

    Use plugindir from gnome-settings-daemon pkg-config file

 configure.ac        |    2 ++
 session/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3a08a14..8a69b6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,8 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0)
 PKG_CHECK_MODULES(LCMS, lcms2)
 PKG_CHECK_MODULES(X11, x11)
 PKG_CHECK_MODULES(SETTINGS_DAEMON, gnome-settings-daemon)
+PLUGINDIR=`$PKG_CONFIG --variable=plugindir gnome-settings-daemon`
+AC_SUBST([PLUGINDIR], ["$PLUGINDIR"])
 PKG_CHECK_MODULES(USB, libusb-1.0 >= 1.0.9, has_new_libusb=yes, has_new_libusb=no)
 if test x$has_new_libusb = xyes; then
 	AC_DEFINE(HAVE_NEW_USB,1,[Got new libusb])
diff --git a/session/Makefile.am b/session/Makefile.am
index 778d296..601fed8 100644
--- a/session/Makefile.am
+++ b/session/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES =							\
 	$(SETTINGS_DAEMON_CFLAGS)				\
 	$(GUDEV_CFLAGS)
 
-plugindir = $(libdir)/gnome-settings-daemon-2.0
+plugindir = $(PLUGINDIR)
 plugin_LTLIBRARIES =						\
 	libcolor.la
 plugin_CFLAGS =							\



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