M .gitignore → .gitignore

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

M Makefile.am → 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,7 +413,12 @@ 
 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 $@

M data/autostart.sh → data/autostart.sh.in

@@ -39,6 +39,6 @@ 
 # 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