From: Dana Jansens <danakj@orodu.net>
Date: Wed, 30 Mar 2011 15:13:06 +0000 (-0400)
Subject: fix global autostart installation, and the pointer to it so it is run
X-Git-Tag: release-3.5.0~21
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=6624d06dd17490189764ca6c3a6c7eb8c5f55a5b;hp=007f0917b848fc6dda0b1b40773bc09b3f5f5668

fix global autostart installation, and the pointer to it so it is run
---

diff --git a/Makefile.am b/Makefile.am
index f57a770..c3feae6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,8 +47,7 @@ nodist_rc_SCRIPTS = \
 	data/autostart/autostart
 
 dist_libexec_SCRIPTS = \
-	data/autostart/openbox-xdg-autostart \
-	data/autostart/openbox-autostart
+	data/autostart/openbox-xdg-autostart
 
 nodist_libexec_SCRIPTS = \
 	data/autostart/openbox-autostart
@@ -468,6 +467,7 @@ dist_rc_DATA = \
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@rcdir\@!$(rcdir)!' \
 	-e 's!@libexecdir\@!$(libexecdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
diff --git a/data/autostart/openbox-autostart.in b/data/autostart/openbox-autostart.in
index 3b2f5ec..4c4b91b 100755
--- a/data/autostart/openbox-autostart.in
+++ b/data/autostart/openbox-autostart.in
@@ -11,7 +11,7 @@ elif which xsetroot >/dev/null; then
 fi
 test -z $BG || $BG -solid "#303030"
 
-GLOBALAUTOSTART="@configdir@/autostart"
+GLOBALAUTOSTART="@rcdir@/autostart"
 AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart"
 
 # Run the global openbox autostart script