Move manpages from man directory to next to their programs.

diff --git a/Makefile.am b/Makefile.am
index 7ebc633..4644b05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,4 +3,4 @@ SUBDIRS = lib datapath secchan controller
 if HAVE_IF_PACKET
 SUBDIRS += switch
 endif
-SUBDIRS += utilities tests man include third-party
+SUBDIRS += utilities tests include third-party

diff --git a/README b/README
index 75c0130..a5d7a30 100644 (file)
--- a/README
+++ b/README
@@ -61,9 +61,8 @@ This distribution includes some additional software as well:
        - A patch to tcpdump that enables it to parse OpenFlow
           messages.
 
-For installation instructions, read INSTALL.  This distribution also
-includes manpages for each of its userspace programs, in the man/
-directory.
+For installation instructions, read INSTALL.  Each userspace program
+is also accompanied by a manpage.
 
 Platform support
 ----------------

diff --git a/configure.ac b/configure.ac
index eb80441..0cdc593 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -109,8 +109,6 @@ AC_CHECK_LIB([dl], [dladdr])
 CFLAGS="$CFLAGS -Wall -Wno-sign-compare"
 
 AC_CONFIG_FILES([Makefile 
-man/Makefile
-man/man8/Makefile
 datapath/Makefile 
 lib/Makefile
 include/Makefile

diff --git a/controller/Makefile.am b/controller/Makefile.am
index 87642e9..e783a7e 100644 (file)
--- a/controller/Makefile.am
+++ b/controller/Makefile.am
@@ -1,6 +1,7 @@
 include ../Make.vars
 
 bin_PROGRAMS = controller
+dist_man_MANS = controller.8
 
 controller_SOURCES = controller.c
 controller_LDADD = ../lib/libopenflow.la -ldl

diff --git a/man/man8/controller.8 b/controller/controller.8
similarity index 100%
rename from man/man8/controller.8
rename to controller/controller.8

diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644 (file)
index b336cc7..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in

diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644 (file)
index 9bc4801..0000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = man8 

diff --git a/man/man8/.gitignore b/man/man8/.gitignore
deleted file mode 100644 (file)
index b336cc7..0000000
--- a/man/man8/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in

diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
deleted file mode 100644 (file)
index 0f28df8..0000000
--- a/man/man8/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-dist_man_MANS = controller.8 dpctl.8 secchan.8 vlogconf.8

diff --git a/secchan/Makefile.am b/secchan/Makefile.am
index 882c98e..10de232 100644 (file)
--- a/secchan/Makefile.am
+++ b/secchan/Makefile.am
@@ -2,8 +2,10 @@ include ../Make.vars
 
 if HAVE_NETLINK
 bin_PROGRAMS = secchan
+dist_man_MANS = secchan.8
 else
 bin_PROGRAMS = 
+dist_man_MANS =
 endif
 
 secchan_SOURCES = secchan.c

diff --git a/man/man8/secchan.8 b/secchan/secchan.8
similarity index 100%
rename from man/man8/secchan.8
rename to secchan/secchan.8

diff --git a/switch/Makefile.am b/switch/Makefile.am
index c16cef7..2ea1ac2 100644 (file)
--- a/switch/Makefile.am
+++ b/switch/Makefile.am
@@ -1,6 +1,7 @@
 include ../Make.vars
 
 bin_PROGRAMS = switch
+dist_man_MANS = switch.8
 
 switch_SOURCES = \
        chain.c \

diff --git a/man/man8/switch.8 b/switch/switch.8
similarity index 100%
rename from man/man8/switch.8
rename to switch/switch.8

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index b07dd49..9b3e4df 100644 (file)
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -1,6 +1,7 @@
 include ../Make.vars
 
 bin_PROGRAMS = vlogconf dpctl
+dist_man_MANS = vlogconf.8 dpctl.8 ofp-pki.8
 
 dpctl_SOURCES = dpctl.c
 dpctl_LDADD = ../lib/libopenflow.la

diff --git a/man/man8/dpctl.8 b/utilities/dpctl.8
similarity index 100%
rename from man/man8/dpctl.8
rename to utilities/dpctl.8

diff --git a/man/man8/ofp-pki.8 b/utilities/ofp-pki.8
similarity index 100%
rename from man/man8/ofp-pki.8
rename to utilities/ofp-pki.8

diff --git a/man/man8/vlogconf.8 b/utilities/vlogconf.8
similarity index 100%
rename from man/man8/vlogconf.8
rename to utilities/vlogconf.8