Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 10 insertions, 10 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d440140..969e277 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,17 +2,17 @@
 # Makefile.am for fluxbox/doc
 
 SUBDIRS = ru
-CLEANFILES = fluxbox.1 fluxstyle.1
+CLEANFILES = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-apps.5 \
+        fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5
 MAINTAINERCLEANFILES = Makefile.in
-man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \
-        startfluxbox.1 fluxstyle.1 fbrun.1 fluxbox-keys.5 fluxbox-remote.1
-EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 fluxbox-keys.5 fluxbox-remote.1 startfluxbox.1 fbsetbg.1 \
-        fluxstyle.1.in CODESTYLE
+man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox-apps.5 \
+        fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5 \
+        startfluxbox.1
+EXTRA_DIST=startfluxbox.1.in CODESTYLE \
+        fluxbox.1.in fbrun.1.in fbsetbg.1.in fbsetroot.1.in fluxbox-apps.5.in \
+        fluxbox-keys.5.in fluxbox-menu.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
-
-fluxstyle.1: fluxstyle.1.in
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxstyle.1.in > fluxstyle.1
+%: %.in
+        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $^ > $@