manpages: Fix build

This patch fixes regressions in the dist and distclean targets, and in
the Debian build process, that were introduced by commit d2cb6c956b
(manpages: Put version number instead of date at bottom of page.).

Signed-off-by: Saul St. John <sstjohn@cs.wisc.edu>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index 060fc19..0639f7e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -169,7 +169,7 @@ Ramana Reddy            gtvrreddy@gmail.com
 Rob Sherwood            rob.sherwood@bigswitch.com
 Roger Leigh             rleigh@codelibre.net
 Rogério Vinhal Nunes
-Saul St. John
+Saul St. John           sstjohn@cs.wisc.edu
 Scott Hendricks         shendricks@nicira.com
 Sean Brady              sbrady@gtfservices.com
 Sebastian Andrzej Siewior  sebastian@breakpoint.cc

diff --git a/debian/openvswitch-common.manpages b/debian/openvswitch-common.manpages
index 05e93a8..5969677 100644 (file)
--- a/debian/openvswitch-common.manpages
+++ b/debian/openvswitch-common.manpages
@@ -4,6 +4,6 @@ _debian/utilities/ovs-appctl.8
 _debian/utilities/ovs-benchmark.1
 _debian/utilities/ovs-ofctl.8
 _debian/utilities/ovs-pki.8
-utilities/bugtool/ovs-bugtool.8
+_debian/utilities/bugtool/ovs-bugtool.8
 utilities/ovs-parse-backtrace.8
 utilities/ovs-parse-leaks.8

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index 30dac49..88f905a 100644 (file)
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -4,7 +4,7 @@ CLEANFILES += utilities/bugtool/ovs-bugtool
 
 man_MANS += utilities/bugtool/ovs-bugtool.8
 MAN_ROOTS += utilities/bugtool/ovs-bugtool.8.in
-DISTCLEANFILES += utilities/bugtool/ovs-ofctl.8
+DISTCLEANFILES += utilities/bugtool/ovs-bugtool.8
 
 bugtool_plugins = \
        utilities/bugtool/plugins/kernel-info/openvswitch.xml \
@@ -51,5 +51,4 @@ endif
 EXTRA_DIST += \
        $(bugtool_plugins) \
        $(bugtool_scripts) \
-       utilities/bugtool/ovs-bugtool.8 \
        utilities/bugtool/ovs-bugtool.in