5 files changed, 22 insertions, 16 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8268fff..2e39d5b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,17 +2,14 @@
 # Makefile.am for fluxbox/doc
 
 SUBDIRS = ru
-CLEANFILES = fluxbox.1 fluxbox-style.5
+CLEANFILES = fluxbox.1 fluxbox-apps.5 fluxbox-keys.5 fluxbox-remote.1 fluxbox-style.5
 MAINTAINERCLEANFILES = Makefile.in
-man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \
-        startfluxbox.1 fluxbox-style.5 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1
-EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1 startfluxbox.1 fbsetbg.1 \
-        fluxbox-style.5.in CODESTYLE
+man_MANS = fbsetroot.1 fbrun.1 fbsetbg.1 startfluxbox.1 \
+        fluxbox.1 fluxbox-apps.5 fluxbox-keys.5 fluxbox-remote.1 fluxbox-style.5
+EXTRA_DIST=fbsetroot.1 fbrun.1 fbsetbg.1 startfluxbox.1 CODESTYLE \
+        fluxbox.1.in fluxbox-apps.5.in fluxbox-keys.5.in fluxbox-remote.1.in fluxbox-style.5.in
 distclean-local:
         rm -f *\~
 
-fluxbox.1: fluxbox.1.in
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1
-
-fluxbox-style.5: fluxbox-style.5.in
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox-style.5.in > fluxbox-style.5
+%: %.in
+        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $^ > $@
diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile
index 646d415..95c5ee9 100644
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@@ -2,25 +2,34 @@
 # create manpages from the asciidoc files
 #
 
-SRC1 = fluxbox.txt fluxbox-keys.txt fluxbox-remote.txt
+SRC1 = fluxbox.txt fluxbox-remote.txt
 SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt
 
-MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
+MAN = $(SRC1:.txt=.1.in) $(SRC5:.txt=.5.in)
 
-all : $(MAN)
+all: $(MAN)
+
+install-above: all
+        cp $(MAN) ../
 
 clean:
         rm -fv $(MAN)
 
-%.xml : %.txt
-        asciidoc -b docbook -d manpage -o $@ $<
-
 %.1 : %.xml
         xmlto man $<
 
 %.5 : %.xml
         xmlto man $<
 
+%.1.in: %.1
+        cp $< $@
+
+%.5.in: %.5
+        cp $< $@
+
+%.xml : %.txt
+        asciidoc -b docbook -d manpage -o $@ $<
+
 # Dependencies:
 #
 # fluxbox-apps(5) and fluxbox-keys(5) both include client-patterns.txt
diff --git a/doc/fluxbox-apps.5 b/doc/fluxbox-apps.5.in
index 8a98ccc..8a98ccc 100644
--- a/doc/fluxbox-apps.5
+++ b/doc/fluxbox-apps.5.in
diff --git a/doc/fluxbox-keys.5 b/doc/fluxbox-keys.5.in
index ebcdc74..ebcdc74 100644
--- a/doc/fluxbox-keys.5
+++ b/doc/fluxbox-keys.5.in
diff --git a/doc/fluxbox-remote.1 b/doc/fluxbox-remote.1.in
index b27e30f..b27e30f 100644
--- a/doc/fluxbox-remote.1
+++ b/doc/fluxbox-remote.1.in