Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 21 insertions, 6 deletions

diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile
index 944c701..666d437 100644
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@@ -2,21 +2,36 @@
 # create manpages from the asciidoc files
 #
 
-SRC1 = fluxbox.txt fluxstyle.txt fluxbox-keys.txt fluxbox-remote.txt
-SRC5 = fluxbox-keys.txt
+SRC1 = fluxbox.txt fluxbox-remote.txt fbrun.txt fbsetbg.txt fbsetroot.txt startfluxbox.txt
+SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt fluxbox-menu.txt
 
 MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
+MANdotIN = $(addsuffix .in,$(MAN))
+DISTFILES = $(addprefix ../,$(MANdotIN))
+
+all: $(MAN)
+
+dist: $(DISTFILES)
 
-all : $(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
+fluxbox-keys.5 fluxbox-apps.5: client-patterns.txt