properly tell where the config files are

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 35eaa47eb6b77ab59a471b91c594ae23edf62a21..6fb85748bf6def80b348e087bfe68ddd1380989c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -364,6 +364,7 @@ dist_rc_DATA = \
 
 edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
+       -e 's!@configdir\@!$(configdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
 data/xsession/openbox-gnome-session: Makefile data \
@@ -372,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
@@ -380,7 +381,27 @@ 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 >$@
+
+doc/openbox-gnome-session.1: Makefile doc doc/openbox-gnome-session.1.sgml
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@
+
+doc/openbox-kde-session.1: Makefile doc doc/openbox-kde-session.1.sgml
+       @echo make: creating $@
+       @mkdir doc 2>/dev/null || true
+       docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@
 
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop
@@ -434,6 +455,11 @@ dist_doc_DATA = \
        data/menu.xsd \
        data/themerc.xsd
 
+man_MANS = \
+       doc/openbox.1 \
+       doc/openbox-gnome-session.1 \
+       doc/openbox-kde-session.1
+
 EXTRA_DIST = \
        config.rpath \
        mkinstalldirs \