Move manpages to doc/

This will make integrating the building of HTML versions of these
manpages into the build system way easier, at the cost of keeping
manpages in a different directory to the source for the program they
describe. I think this is an acceptable trade-off.

bus/.gitignore

@@ -19,7 +19,6 @@ messagebus
 messagebus-config
 session.conf
 system.conf
-dbus-daemon.1
 bus-test-launch-helper
 bus-test-system
 dbus.service

bus/Makefile.am

@@ -276,9 +276,6 @@ systemdsystemunit_DATA = \
 	dbus.socket
 endif
 
-MAN_IN_FILES=dbus-daemon.1.in
-man_MANS = dbus-daemon.1
-
 #### Extra dist
 
-EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) $(man_MANS) $(MAN_IN_FILES)
+EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES)

configure.in

@@ -1579,7 +1579,6 @@ bus/session.conf
 bus/messagebus
 bus/messagebus-config
 bus/rc.messagebus
-bus/dbus-daemon.1
 bus/dbus.service
 bus/dbus.socket
 Makefile
@@ -1589,6 +1588,7 @@ tools/Makefile
 test/Makefile
 test/name-test/Makefile
 doc/Makefile
+doc/dbus-daemon.1
 dbus-1.pc
 test/data/valid-config-files/debug-allow-all.conf
 test/data/valid-config-files/debug-allow-all-sha1.conf

doc/.gitignore

@@ -10,3 +10,4 @@ dbus-specification.html
 dbus-test-plan.html
 dbus-tutorial.html
 dbus-faq.html
+dbus-daemon.1

doc/Makefile.am

@@ -1,3 +1,13 @@
+man_MANS = \
+	dbus-cleanup-sockets.1 \
+	dbus-daemon.1 \
+	dbus-launch.1 \
+	dbus-monitor.1 \
+	dbus-send.1 \
+	dbus-uuidgen.1
+
+MAN_IN_FILES = dbus-daemon.1.in
+
 EXTRA_DIST= 					\
 	busconfig.dtd				\
 	diagram.png				\
@@ -10,7 +20,8 @@ EXTRA_DIST= 					\
 	dcop-howto.txt				\
 	file-boilerplate.c			\
 	introspect.xsl				\
-	system-activation.txt
+	system-activation.txt			\
+	$(MAN_IN_FILES) $(man_MANS)
 
 HTML_FILES=					\
 	dbus-faq.html				\

tools/Makefile.am

@@ -48,8 +48,7 @@ dbus_uuidgen_LDFLAGS=@R_DYNAMIC_LDFLAG@
 dbus_launch_LDADD= $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS)
 dbus_launch_LDFLAGS=@R_DYNAMIC_LDFLAG@
 
-man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1
-EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh strtoll.c strtoull.c
+EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c
 CLEANFILES = 				\
 	run-with-tmp-session-bus.conf