From b1dc814128c2cd402ef7b6717348a795a3c0ad14 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 27 Feb 2008 19:21:16 -0500
Subject: make the xdg-autostart script get installed to PREFIX/lib/openbox,
 and make the autostart.sh script look for it there.

---
 .gitignore           |  1 +
 Makefile.am          |  8 +++++++-
 data/autostart.sh    | 44 --------------------------------------------
 data/autostart.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 45 deletions(-)
 delete mode 100644 data/autostart.sh
 create mode 100644 data/autostart.sh.in

diff --git a/.gitignore b/.gitignore
index 3baae143..8397f121 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
deleted file mode 100644
index 23345049..00000000
--- a/data/autostart.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-# This shell script is run before Openbox launches.
-# Environment variables set here are passed to the Openbox session.
-
-# Set a background color
-BG=""
-if which hsetroot >/dev/null; then
-    BG=hsetroot
-else
-    if which esetroot >/dev/null; then
-	BG=esetroot
-    else
-	if which xsetroot >/dev/null; then
-	    BG=xsetroot
-	fi
-    fi
-fi
-test -z $BG || $BG -solid "#303030"
-
-# D-bus
-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-       eval `dbus-launch --sh-syntax --exit-with-session`
-fi
-
-# Make GTK apps look and behave how they were set up in the gnome config tools
-if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then
-  /usr/libexec/gnome-settings-daemon &
-elif which gnome-settings-daemon >/dev/null; then
-  gnome-settings-daemon &
-# Make GTK apps look and behave how they were set up in the XFCE config tools
-elif which xfce-mcs-manager >/dev/null; then
-  xfce-mcs-manager n &
-fi
-
-# Preload stuff for KDE apps
-if which start_kdeinit >/dev/null; then
-  LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup &
-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
-fi
diff --git a/data/autostart.sh.in b/data/autostart.sh.in
new file mode 100644
index 00000000..62a30e1c
--- /dev/null
+++ b/data/autostart.sh.in
@@ -0,0 +1,44 @@
+# This shell script is run before Openbox launches.
+# Environment variables set here are passed to the Openbox session.
+
+# Set a background color
+BG=""
+if which hsetroot >/dev/null; then
+    BG=hsetroot
+else
+    if which esetroot >/dev/null; then
+	BG=esetroot
+    else
+	if which xsetroot >/dev/null; then
+	    BG=xsetroot
+	fi
+    fi
+fi
+test -z $BG || $BG -solid "#303030"
+
+# D-bus
+if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+       eval `dbus-launch --sh-syntax --exit-with-session`
+fi
+
+# Make GTK apps look and behave how they were set up in the gnome config tools
+if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then
+  /usr/libexec/gnome-settings-daemon &
+elif which gnome-settings-daemon >/dev/null; then
+  gnome-settings-daemon &
+# Make GTK apps look and behave how they were set up in the XFCE config tools
+elif which xfce-mcs-manager >/dev/null; then
+  xfce-mcs-manager n &
+fi
+
+# Preload stuff for KDE apps
+if which start_kdeinit >/dev/null; then
+  LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup &
+fi
+
+# Run XDG autostart things.  By default don't run anything desktop-specific
+# See xdg-autostart --help more info
+DESKTOP_ENV=""
+if which @secretbindir@/xdg-autostart >/dev/null; then
+  @secretbindir@/xdg-autostart $DESKTOP_ENV
+fi
-- 
cgit v1.2.3