diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-02-17 16:11:36 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-02-17 16:11:36 -0500 |
| commit | bcc31faf7ecd8b0ad3b66a75fc72145e93e6c35a (patch) | |
| tree | de901ca02d357392d35e88ce42db60e8adca841f /Makefile.am | |
| parent | 7d71fb8a77ba9e2ea4938e793410f029265507a8 (diff) | |
revamp the autostart functionality, so autostart apps launch after openbox.
add /usr/libexec/openbox-autostart which runs the global/user scripts and
launches /usr/libexec/openbox-xdg-autostart (which runs .desktop autostart
stuff)
make openbox-session call openbox with --startup option, to make openbox launch
/usr/libexec/openbox-autostart *after* it is initialized.
add /etc/xdg/openbox/environment and ~/.config/openbox/environment files to let
user change environment variables (locale) for their Openbox session, which
openbox-session loads before running openbox.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 4c1f89d4..67d6e8b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/obrender pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox -secretbindir = $(libdir)/openbox +libexecdir = $(prefix)/libexec appsdir = $(datadir)/applications theme = Clearlooks @@ -36,14 +36,20 @@ bin_PROGRAMS = \ tools/gnome-panel-control/gnome-panel-control \ tools/obxprop/obxprop -dist_secretbin_SCRIPTS = \ - tools/xdg-autostart/xdg-autostart - nodist_bin_SCRIPTS = \ data/xsession/openbox-session \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session +dist_rc_SCRIPTS = \ + data/environment \ + data/autostart/autostart + +dist_libexec_SCRIPTS = \ + data/autostart/openbox-xdg-autostart \ + data/autostart/openbox-autostart + + ## obrender ## obrender_rendertest_CPPFLAGS = \ @@ -446,9 +452,6 @@ dist_apps_DATA = \ dist_pixmap_DATA = \ data/openbox.png -nodist_rc_DATA = \ - data/autostart.sh - dist_rc_DATA = \ data/rc.xml \ data/menu.xml @@ -456,10 +459,10 @@ dist_rc_DATA = \ 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 +data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile @echo make: creating $@ @$(edit) $< >$@ @@ -488,7 +491,6 @@ nodist_xsessions_DATA = \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ - data/autostart.sh.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ |