run gnome-settings-daemon from the libexecdir as provided by automake

diff --git a/Makefile.am b/Makefile.am
index fe6ef92df04ec9bb2035327ce331dddf2c9dd14a..f262fb993b4831e9257c8e7f146008fb12a4f9fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -444,6 +444,7 @@ edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@configdir\@!$(configdir)!' \
        -e 's!@secretbindir\@!$(secretbindir)!' \
+       -e 's!@libexecdir\@!$(libexecdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
 data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile

diff --git a/data/autostart.sh.in b/data/autostart.sh.in
index eb55558a7f9fff001da49fa27b591ecf210d7d05..910e5e8643a39896dc40667cd1e7d2a09bfe9a35 100644 (file)
--- a/data/autostart.sh.in
+++ b/data/autostart.sh.in
@@ -22,8 +22,8 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
 fi
 
 # Make GTK apps look and behave how they were set up in the gnome config tools
-if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then
-  /usr/libexec/gnome-settings-daemon &
+if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+  @libexecdir@/gnome-settings-daemon &
 elif which gnome-settings-daemon >/dev/null; then
   gnome-settings-daemon &
 # Make GTK apps look and behave how they were set up in the XFCE config tools