kill the .in's for xml. we're not installing the xsd to the filesystem anymore anyways.

kill the openbox-kde and openbox-gnome, we're going to have to do it different.
put the full path to the openbox binary in the openbox-*-session files by using .in's

4 files changed, 2 insertions, 10 deletions

diff --git a/data/xsession/openbox-gnome b/data/xsession/openbox-gnome
deleted file mode 100755
index c146aa81..00000000
--- a/data/xsession/openbox-gnome
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# A temporary script to be replaced by a real program..
-exec openbox --restart-binary openbox-gnome "$@"
diff --git a/data/xsession/openbox-gnome-session b/data/xsession/openbox-gnome-session.in
index d2b77014..c2bc9399 100755..100644
--- a/data/xsession/openbox-gnome-session
+++ b/data/xsession/openbox-gnome-session.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Run GNOME with Openbox as its window manager
-export WINDOW_MANAGER=openbox-gnome
+export WINDOW_MANAGER="@bindir@/openbox"
 exec gnome-session "$@"
diff --git a/data/xsession/openbox-kde b/data/xsession/openbox-kde
deleted file mode 100755
index 87a5812c..00000000
--- a/data/xsession/openbox-kde
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# A temporary script to be replaced by a real program..
-exec openbox --restart-binary openbox-kde "$@"
diff --git a/data/xsession/openbox-kde-session b/data/xsession/openbox-kde-session.in
index 589a2c56..0fe00940 100755..100644
--- a/data/xsession/openbox-kde-session
+++ b/data/xsession/openbox-kde-session.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Run KDE with Openbox as its window manager
-export KDEWM=openbox-kde
+export KDEWM="@bindir@/openbox"
 exec startkde "$@"