X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=0d688f1ab8c3ff5b1f857d4fe98c03d62c36ec47;hb=74f36c587ca5ae456434115ae28e3e07bf8a970c;hp=8612a20768ed3db6c4154ec97470a8d90203dd8d;hpb=4f6908feed54691d4b6e418fccde90c4ddfc1617;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 8612a207..0d688f1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ desktopfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
+xsddir          = $(datadir)/openbox
 userscriptdir   = $(datadir)/openbox
 
 theme = TheBear
@@ -27,7 +28,7 @@ lib_LTLIBRARIES = \
 bin_PROGRAMS = \
 	openbox/openbox \
 	tools/kdetrayproxy/kdetrayproxy \
-	tools/gnomepanelproxy/gnomepanelproxy
+	tools/gnome-panel-control/gnome-panel-control
 
 ## render ##
 
@@ -202,14 +203,14 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \
 	tools/kdetrayproxy/kdetrayproxy.c
 
 
-## gnomepanelproxy ##
+## gnome-panel-control ##
 
-tools_gnomepanelproxy_gnomepanelproxy_CPPFLAGS = \
+tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
 	$(X_CFLAGS)
-tools_gnomepanelproxy_gnomepanelproxy_LDADD = \
+tools_gnome_panel_control_gnome_panel_control_LDADD = \
 	$(X_LIBS)
-tools_gnomepanelproxy_gnomepanelproxy_SOURCES = \
-	tools/gnomepanelproxy/gnomepanelproxy.c
+tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+	tools/gnome-panel-control/gnome-panel-control.c
 
 
 ## themes ##
@@ -269,20 +270,30 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
 	data/openbox.png
 
-dist_rc_DATA = \
+nodist_rc_DATA = \
 	data/rc.xml \
 	data/menu.xml
 
+dist_xsd_DATA = \
+	data/rc.xsd \
+	data/menu.xsd
+
+%.xml: %.xml.in
+	@echo make: creating $@
+	@$(SED) -e 's!@version@!$(VERSION)!' -e 's!@xsddir@!$(xsddir)!' $^ > $@
+
 dist_userscript_DATA = \
 	tools/themeupdate/themeupdate.py
 
 install-data-hook:
-	chmod +x $(userscriptdir)/themeupdate.py
+	chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
 
 dist_desktopfiles_DATA = \
 	data/openbox.desktop
 
 dist_noinst_DATA = \
+	data/rc.xml.in \
+	data/menu.xml.in \
 	render/obrender-3.0.pc.in \
 	parser/obparser-3.0.pc.in