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.

diff --git a/bus/.gitignore b/bus/.gitignore
index 7435267..bad51b1 100644 (file)
--- a/bus/.gitignore
+++ b/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

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 5c4fb15..17c0df8 100644 (file)
--- a/bus/Makefile.am
+++ b/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)

diff --git a/configure.in b/configure.in
index e047296..6c1c9c1 100644 (file)
--- a/configure.in
+++ b/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

diff --git a/doc/.gitignore b/doc/.gitignore
index 3430689..2312573 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -10,3 +10,4 @@ dbus-specification.html
 dbus-test-plan.html
 dbus-tutorial.html
 dbus-faq.html
+dbus-daemon.1

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d6554e1..445d2fd 100644 (file)
--- a/doc/Makefile.am
+++ b/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                           \

diff --git a/tools/dbus-cleanup-sockets.1 b/doc/dbus-cleanup-sockets.1
similarity index 100%
rename from tools/dbus-cleanup-sockets.1
rename to doc/dbus-cleanup-sockets.1

diff --git a/bus/dbus-daemon.1.in b/doc/dbus-daemon.1.in
similarity index 100%
rename from bus/dbus-daemon.1.in
rename to doc/dbus-daemon.1.in

diff --git a/tools/dbus-launch.1 b/doc/dbus-launch.1
similarity index 100%
rename from tools/dbus-launch.1
rename to doc/dbus-launch.1

diff --git a/tools/dbus-monitor.1 b/doc/dbus-monitor.1
similarity index 100%
rename from tools/dbus-monitor.1
rename to doc/dbus-monitor.1

diff --git a/tools/dbus-send.1 b/doc/dbus-send.1
similarity index 100%
rename from tools/dbus-send.1
rename to doc/dbus-send.1

diff --git a/tools/dbus-uuidgen.1 b/doc/dbus-uuidgen.1
similarity index 100%
rename from tools/dbus-uuidgen.1
rename to doc/dbus-uuidgen.1

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 271c150..ce88c85 100644 (file)
--- a/tools/Makefile.am
+++ b/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