Merge lp:~themuso/unity-settings-daemon/fix-gtk-modules-dir-location into lp:unity-settings-daemon

[Luke Yelavich]

Look for gtk-modules related files in the correct location.

Look for gtk-modules related files in the correct location.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4022
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/18/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'plugins/xsettings/Makefile.am'
--- plugins/xsettings/Makefile.am	2013-12-04 23:55:26 +0000
+++ plugins/xsettings/Makefile.am	2014-02-24 23:31:17 +0000
@@ -23,7 +23,7 @@
 	-I$(top_srcdir)/gnome-settings-daemon		\
 	-I$(top_srcdir)/data/				\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-	-DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
+	-DGTK_MODULES_DIRECTORY=\""$(libdir)/unity-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
 	$(AM_CPPFLAGS)
 
 libexec_PROGRAMS = usd-test-xsettings
@@ -67,7 +67,7 @@
 	-I$(top_srcdir)/gnome-settings-daemon			\
 	-I$(top_srcdir)/data/					\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
-	-DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
+	-DGTK_MODULES_DIRECTORY=\""$(libdir)/unity-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
 	$(AM_CPPFLAGS)
 
 libxsettings_la_CFLAGS = \