ovs-vswitchd.conf.db: Correct the header and footer lines.

Right now, the following 2 lines are how the header and footer looks like for ovs-vswitchd.conf.db @Version@(5) Open vSwitch Manual @Version@(5) Open vSwitch Open_vSwitch @Version@(5) After this commit, they look like this: ovs-vswitchd.conf.db(5) Open vSwitch Manual ovs-vswitchd.conf.db(5) Open vSwitch 1.12.90 ovs-vswitchd.conf.db(5) Signed-off-by: Gurucharan Shetty <[email protected]> Acked-by: Ben Pfaff <[email protected]>
caozhiyuan · Jul 30, 2013 · e627259 · e627259
1 parent 92e02bc
commit e627259
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
@@ -92,7 +92,7 @@ $(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in
 EXTRA_DIST += ovsdb/ovsdb-doc.in
 noinst_SCRIPTS += ovsdb/ovsdb-doc
 DISTCLEANFILES += ovsdb/ovsdb-doc
-OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc.in
+OVSDB_DOC = $(run_python) $(builddir)/ovsdb/ovsdb-doc
 
 # ovsdb-dot
 EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic

diff --git a/ovsdb/ovsdb-doc.in b/ovsdb/ovsdb-doc.in
@@ -265,7 +265,7 @@ def docsToNroff(schemaFile, xmlFile, erFile, title=None):
     # Putting '\" p as the first line tells "man" that the manpage
     # needs to be preprocessed by "pic".
     s = r''''\" p
-.TH @VERSION@ 5 "%s" "Open vSwitch" "Open vSwitch Manual"
+.TH "%s" 5 @VERSION@ "Open vSwitch" "Open vSwitch Manual"
 .\" -*- nroff -*-
 .de TQ
 .  br
@@ -281,7 +281,7 @@ def docsToNroff(schemaFile, xmlFile, erFile, title=None):
 .SH NAME
 %s \- %s database schema
 .PP
-''' % (title, textToNroff(title), schema.name)
+''' % (title, textToNroff(schema.name), schema.name)
 
     tables = ""
     introNodes = []
@@ -392,7 +392,7 @@ if __name__ == "__main__":
             sys.exit(1)
 
         # XXX we should warn about undocumented tables or columns
-        s = docsToNroff(args[0], args[1], er_diagram)
+        s = docsToNroff(args[0], args[1], er_diagram, title)
         for line in s.split("\n"):
             line = line.strip()
             if len(line):

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
@@ -59,7 +59,7 @@ EXTRA_DIST += vswitchd/vswitch.gv vswitchd/vswitch.pic
 EXTRA_DIST += vswitchd/vswitch.xml
 dist_man_MANS += vswitchd/ovs-vswitchd.conf.db.5
 $(srcdir)/vswitchd/ovs-vswitchd.conf.db.5: \
-	ovsdb/ovsdb-doc.in vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
+	ovsdb/ovsdb-doc vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
 	$(srcdir)/vswitchd/vswitch.pic
 	$(OVSDB_DOC) \
 		--title="ovs-vswitchd.conf.db" \