X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=a30248eb43943070eb3be346cd796563dc64e17e;hb=ebabf3943c926547739254fb67f8024166ea000f;hp=b879c0178e76722a8ccef8d9b10ee93d8ee604da;hpb=526560b8a0871cd93f27c32442b3e470ec42ecb3;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index b879c017..a30248eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
 rcdir           = $(configdir)/openbox
-desktopfilesdir = $(datadir)/gnome/wm-properties
+xsessionsdir    = $(datadir)/xsessions
+gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
@@ -29,6 +30,12 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
+bin_SCRIPTS = \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session \
+	data/xsession/openbox-gnome \
+	data/xsession/openbox-kde
+
 noinst_PROGRAMS = \
 	tools/themetoxml/themetoxml
 
@@ -366,10 +373,6 @@ nodist_rc_DATA = \
 	data/rc.xml \
 	data/menu.xml
 
-dist_xsd_DATA = \
-	data/rc.xsd \
-	data/menu.xsd
-
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@xsddir\@!$(xsddir)!'
@@ -386,11 +389,21 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
 	@mkdir data 2>/dev/null || true
 	@$(edit) $(srcdir)/data/menu.xml.in >$@
 
-dist_desktopfiles_DATA = \
-	data/openbox.desktop
+dist_gnomewmfiles_DATA = \
+	data/gnome-wm-properties/openbox.desktop \
+	data/gnome-wm-properties/openbox-gnome.desktop \
+	data/gnome-wm-properties/openbox-kde.desktop
+
+dist_xsessions_DATA = \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
 	version.h.in \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
 	data/rc.xml.in \
 	data/menu.xml.in \
 	render/obrender-3.0.pc.in \