From: Dana Jansens <danakj@orodu.net>
Date: Mon, 7 May 2007 02:53:22 +0000 (+0000)
Subject: merge r6118-6132 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~150
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=aae204263a507b976cb751c0896937d143f4a1aa;p=dana%2Fopenbox.git

merge r6118-6132 from trunk
---

aae204263a507b976cb751c0896937d143f4a1aa
diff --cc Makefile.am
index 665b52f5,af283aac..9269fb50
--- a/Makefile.am
+++ b/Makefile.am
@@@ -29,6 -30,15 +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
 -
  ## render ##
  
  render_rendertest_CPPFLAGS = \
@@@ -348,10 -373,10 +355,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)!'
@@@ -373,6 -405,6 +383,8 @@@ dist_xsessions_DATA = 
  
  dist_noinst_DATA = \
  	version.h.in \
++	data/rc.xsd \
++	data/menu.xsd \
  	data/rc.xml.in \
  	data/menu.xml.in \
  	render/obrender-3.0.pc.in \