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

diff --git a/Makefile.am b/Makefile.am
index f57a770351b35c5ee3440392741d7710421de505..c3feae6c1989820b90fefe4462be03e4a32aa013 100644 (file)
--- 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 3b2f5ec5aee549628183ebc295946c55a06e7b44..4c4b91b928f924bd2b41e6cc7e42db84e818eea2 100755 (executable)
--- 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