changes to the manual pages.

[chaz/openbox] / data / xsession / openbox-session.in

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index e76d3203f8f74da81272ac61f2cebb6aa98ae201..c466f17de26f908b975dab24a968d6ea88ca5f57 100644 (file)
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-AUTOSTART="$HOME/.config/openbox/autostart"
+AUTOSTART="$HOME/.config/openbox/autostart.sh"
+GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
 
 if test -e $AUTOSTART; then
     # sleep for 1 second so Openbox is there before anything else
     (sleep 1 && . $AUTOSTART) &
+else
+    if test -e $GLOBALAUTOSTART; then
+        # sleep for 1 second so Openbox is there before anything else
+        (sleep 1 && . $GLOBALAUTOSTART) &
+    fi
 fi
 
 exec @bindir@/openbox "$@"