X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=a97020540552b2a5b4713dce38d8afb0f58bc6c9;hb=469609b9d93654073e2c90acb69f52f68785cc66;hp=a4e1fbb2e4a1b4f42d3a6cf9bc128ff36dbd94b1;hpb=cb30ea2fdea8d0779e56dce99a27723bc1a500e8;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index a4e1fbb2..a9702054 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,8 +363,8 @@ dist_rc_DATA = \
 	data/menu.xml
 
 edit = $(SED) \
-	-e 's!@time\@!$(shell date "+%a, %d %B %Y %T %z")!' \
 	-e 's!@version\@!$(VERSION)!' \
+	-e 's!@confdir\@!$(confdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
 data/xsession/openbox-gnome-session: Makefile data \
@@ -373,7 +373,7 @@ data/xsession/openbox-gnome-session: Makefile data \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
-	@chmod +x $@
+	@chmod a+x $@
 
 data/xsession/openbox-kde-session: Makefile data \
 		$(srcdir)/data/xsession/openbox-kde-session.in
@@ -381,12 +381,20 @@ data/xsession/openbox-kde-session: Makefile data \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
-	@chmod +x $@
+	@chmod a+x $@
+
+doc/openbox.1.in: Makefile doc $(srcdir)/doc/openbox.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@
+
+doc/openbox.1: Makefile doc doc/openbox.1.in
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@$(edit) $(srcdir)/doc/openbox.1.in >$@
 
 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 \
@@ -396,19 +404,13 @@ dist_xsessions_DATA = \
 dist_noinst_DATA = \
 	debian/changelog.in \
 	debian/compat \
+	debian/conffiles \
 	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/menu \
+	debian/postinst \
+	debian/postrm \
 	debian/rules \
-	debian/watch.ex \
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
@@ -438,7 +440,13 @@ dist_noinst_DATA = \
 dist_doc_DATA = \
 	COMPLIANCE \
 	README \
-	AUTHORS
+	AUTHORS \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd
+
+man_MANS = \
+	doc/openbox.1
 
 EXTRA_DIST = \
 	config.rpath \
@@ -456,10 +464,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