make the xdg-autostart script get installed to PREFIX/lib/openbox, and make the autostart.sh script look for it there.

This commit is contained in:
Dana Jansens 2008-02-27 19:21:16 -05:00
parent e35a4697a7
commit b1dc814128
3 changed files with 10 additions and 3 deletions

1
.gitignore vendored
View file

@ -89,3 +89,4 @@ tests/strut
tests/title tests/title
tests/urgent tests/urgent
tests/usertimewin tests/usertimewin
data/autostart.sh

View file

@ -11,6 +11,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox
pixmapdir = $(datadir)/pixmaps pixmapdir = $(datadir)/pixmaps
xsddir = $(datadir)/openbox xsddir = $(datadir)/openbox
secretbindir = $(libdir)/openbox
theme = Clearlooks theme = Clearlooks
@ -31,7 +32,7 @@ bin_PROGRAMS = \
openbox/openbox \ openbox/openbox \
tools/gnome-panel-control/gnome-panel-control tools/gnome-panel-control/gnome-panel-control
bin_SCRIPTS = \ secretbin_SCRIPTS = \
tools/xdg-autostart/xdg-autostart tools/xdg-autostart/xdg-autostart
nodist_bin_SCRIPTS = \ nodist_bin_SCRIPTS = \
@ -412,8 +413,13 @@ dist_rc_DATA = \
edit = $(SED) \ edit = $(SED) \
-e 's!@version\@!$(VERSION)!' \ -e 's!@version\@!$(VERSION)!' \
-e 's!@configdir\@!$(configdir)!' \ -e 's!@configdir\@!$(configdir)!' \
-e 's!@secretbindir\@!$(secretbindir)!' \
-e 's!@bindir\@!$(bindir)!' -e 's!@bindir\@!$(bindir)!'
data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
@echo make: creating $@
@$(edit) $< >$@
%.desktop: %.desktop.in Makefile %.desktop: %.desktop.in Makefile
@echo make: creating $@ @echo make: creating $@
@$(edit) $< >$@ @$(edit) $< >$@

View file

@ -39,6 +39,6 @@ fi
# Run XDG autostart things. By default don't run anything desktop-specific # Run XDG autostart things. By default don't run anything desktop-specific
# See xdg-autostart --help more info # See xdg-autostart --help more info
DESKTOP_ENV="" DESKTOP_ENV=""
if which xdg-autostart >/dev/null; then if which @secretbindir@/xdg-autostart >/dev/null; then
xdg-autostart $DESKTOP_ENV @secretbindir@/xdg-autostart $DESKTOP_ENV
fi fi