From: Dana Jansens <danakj@orodu.net>
Date: Wed, 24 Feb 2010 18:30:00 +0000 (-0500)
Subject: run gnome-settings-daemon from the libexecdir as provided by automake
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8ac9d3fab68faec0119692ef5c144cf2e0886040;p=mikachu%2Fopenbox.git

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

diff --git a/Makefile.am b/Makefile.am
index fe6ef92d..f262fb99 100644
--- 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 eb55558a..910e5e86 100644
--- 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