diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-27 19:21:16 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-27 19:36:48 -0500 |
| commit | b1dc814128c2cd402ef7b6717348a795a3c0ad14 (patch) | |
| tree | aa41f59216770cb86080292860d16bdde679b1b2 | |
| parent | e35a4697a76dc520d582dad242e578a617d0bdfe (diff) | |
make the xdg-autostart script get installed to PREFIX/lib/openbox, and make the autostart.sh script look for it there.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | data/autostart.sh.in (renamed from data/autostart.sh) | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -89,3 +89,4 @@ tests/strut tests/title tests/urgent tests/usertimewin +data/autostart.sh diff --git a/Makefile.am b/Makefile.am index 051be7d7..fa8f65d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,6 +11,7 @@ pkgconfigdir = $(libdir)/pkgconfig pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox +secretbindir = $(libdir)/openbox theme = Clearlooks @@ -31,7 +32,7 @@ bin_PROGRAMS = \ openbox/openbox \ tools/gnome-panel-control/gnome-panel-control -bin_SCRIPTS = \ +secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart nodist_bin_SCRIPTS = \ @@ -412,8 +413,13 @@ dist_rc_DATA = \ edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ -e 's!@configdir\@!$(configdir)!' \ + -e 's!@secretbindir\@!$(secretbindir)!' \ -e 's!@bindir\@!$(bindir)!' +data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile + @echo make: creating $@ + @$(edit) $< >$@ + %.desktop: %.desktop.in Makefile @echo make: creating $@ @$(edit) $< >$@ diff --git a/data/autostart.sh b/data/autostart.sh.in index 23345049..62a30e1c 100644 --- a/data/autostart.sh +++ b/data/autostart.sh.in @@ -39,6 +39,6 @@ fi # Run XDG autostart things. By default don't run anything desktop-specific # See xdg-autostart --help more info DESKTOP_ENV="" -if which xdg-autostart >/dev/null; then - xdg-autostart $DESKTOP_ENV +if which @secretbindir@/xdg-autostart >/dev/null; then + @secretbindir@/xdg-autostart $DESKTOP_ENV fi |