From: Dana Jansens 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-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=6624d06dd17490189764ca6c3a6c7eb8c5f55a5b;p=chaz%2Fopenbox fix global autostart installation, and the pointer to it so it is run --- diff --git a/Makefile.am b/Makefile.am index f57a7703..c3feae6c 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 3b2f5ec5..4c4b91b9 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