From 9446ee791c5fe89e1c96b550cd22e7791f6d4535 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Mon, 9 Jun 2008 11:01:46 -0700
Subject: [PATCH] Move manpages from man directory to next to their programs.

---
 Makefile.am                           | 2 +-
 README                                | 5 ++---
 configure.ac                          | 2 --
 controller/Makefile.am                | 1 +
 {man/man8 => controller}/controller.8 | 0
 man/.gitignore                        | 2 --
 man/Makefile.am                       | 1 -
 man/man8/.gitignore                   | 2 --
 man/man8/Makefile.am                  | 1 -
 secchan/Makefile.am                   | 2 ++
 {man/man8 => secchan}/secchan.8       | 0
 switch/Makefile.am                    | 1 +
 {man/man8 => switch}/switch.8         | 0
 utilities/Makefile.am                 | 1 +
 {man/man8 => utilities}/dpctl.8       | 0
 {man/man8 => utilities}/ofp-pki.8     | 0
 {man/man8 => utilities}/vlogconf.8    | 0
 17 files changed, 8 insertions(+), 12 deletions(-)
 rename {man/man8 => controller}/controller.8 (100%)
 delete mode 100644 man/.gitignore
 delete mode 100644 man/Makefile.am
 delete mode 100644 man/man8/.gitignore
 delete mode 100644 man/man8/Makefile.am
 rename {man/man8 => secchan}/secchan.8 (100%)
 rename {man/man8 => switch}/switch.8 (100%)
 rename {man/man8 => utilities}/dpctl.8 (100%)
 rename {man/man8 => utilities}/ofp-pki.8 (100%)
 rename {man/man8 => utilities}/vlogconf.8 (100%)

diff --git a/Makefile.am b/Makefile.am
index 7ebc633e..4644b057 100644
--- 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 75c01300..a5d7a308 100644
--- 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 eb80441d..0cdc593a 100644
--- 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 87642e98..e783a7e9 100644
--- 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
index b336cc7c..00000000
--- 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
index 9bc48012..00000000
--- 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
index b336cc7c..00000000
--- 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
index 0f28df8c..00000000
--- 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 882c98e7..10de2324 100644
--- 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 c16cef72..2ea1ac2d 100644
--- 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 b07dd49f..9b3e4df2 100644
--- 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
-- 
2.30.2