X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=8384451827ac83acc49073e24d4420f081cb80bb;hb=b906db3e11c06997261297cdb1992fd1b05738ff;hp=36768ec303aef6d026af2bee4e27ad41a56b62a8;hpb=9e398b635c7a6230da90bbfbfbd60c901af8cd62;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 36768ec3..83844518 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -360,33 +360,53 @@ dist_pixmap_DATA = \
 
 dist_rc_DATA = \
 	data/rc.xml \
+	data/rc-gnome.xml \
+	data/rc-kde.xml \
 	data/menu.xml
 
 edit = $(SED) \
-	-e 's!@time\@!$(shell date "+%a, %d %B %Y %T %z")!' \
 	-e 's!@version\@!$(VERSION)!' \
+	-e 's!@configdir\@!$(configdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome-session: Makefile data \
+data/xsession/openbox-gnome-session: \
 		$(srcdir)/data/xsession/openbox-gnome-session.in
 	@echo make: creating $@
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
-	@chmod +x $@
+	@$(edit) $< >$@
+	@chmod a+x $@
 
-data/xsession/openbox-kde-session: Makefile data \
+data/xsession/openbox-kde-session: \
 		$(srcdir)/data/xsession/openbox-kde-session.in
 	@echo make: creating $@
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
-	@chmod +x $@
+	@$(edit) $< >$@
+	@chmod a+x $@
+
+doc/openbox.1.in: $(srcdir)/doc/openbox.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
+
+doc/openbox.1: doc/openbox.1.in
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@$(edit) $< >$@
+
+doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
+
+doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
 
 dist_gnomewmfiles_DATA = \
-	data/gnome-wm-properties/openbox.desktop \
-	data/gnome-wm-properties/openbox-gnome.desktop \
-	data/gnome-wm-properties/openbox-kde.desktop
+	data/gnome-wm-properties/openbox.desktop
 
 dist_xsessions_DATA = \
 	data/xsession/openbox.desktop \
@@ -394,21 +414,15 @@ dist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-	debian/changelog.in
-	debian/compat
-	debian/control
-	debian/copyright
-	debian/dirs
-	debian/docs
-	debian/menu.ex
-	debian/openbox-default.ex
-	debian/openbox.doc-base.EX
-	debian/postinst.ex
-	debian/postrm.ex
-	debian/preinst.ex
-	debian/prerm.ex
-	debian/rules
-	debian/watch.ex
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
@@ -438,7 +452,16 @@ dist_noinst_DATA = \
 dist_doc_DATA = \
 	COMPLIANCE \
 	README \
-	AUTHORS
+	AUTHORS \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
+	doc/rc-mouse-focus.xml
+
+dist_man_MANS = \
+	doc/openbox.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
 	config.rpath \
@@ -456,10 +479,4 @@ distclean-local:
 		done \
 	done
 
-deb:	Makefile
-	$(edit) $(srcdir)/debian/changelog.in >$(srcdir)/debian/changelog
-	fakeroot debian/rules binary
-
-#	dpkg-buildpackage -b -rfakeroot -f openbox-$(VERSION).tar.gz
-
-.PHONY: doc deb
+.PHONY: doc