Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 00:37:43 +0000 (19:37 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 00:37:43 +0000 (19:37 -0500)
.gitignore
Makefile.am
data/autostart.sh.in [moved from data/autostart.sh with 92% similarity]

index 3baae14..8397f12 100644 (file)
@@ -89,3 +89,4 @@ tests/strut
 tests/title
 tests/urgent
 tests/usertimewin
+data/autostart.sh
index f061a0f..723004c 100644 (file)
@@ -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) $< >$@ 
similarity index 92%
rename from data/autostart.sh
rename to data/autostart.sh.in
index 2334504..62a30e1 100644 (file)
@@ -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