commit 3201f076de801ba502c63ded3a55972d65ea0aa0
Author: Matthew Johnson <mjj29@qadesh.matthew.ath.cx>
Date: Fri Feb 20 21:54:14 2009 +0000
patches from Omair Majid <omajid@redhat.com>
diff --git a/DBusCall.sgml b/DBusCall.sgml
index 0b0456d..9efd4f0 100644
--- a/DBusCall.sgml
+++ b/DBusCall.sgml
@@ -61,7 +61,13 @@ manpage.1: manpage.sgml
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>&dhpackage;</command> <replaceable>dest</replaceable> <replaceable>path</replaceable> <replaceable>interface</replaceable> <replaceable>method</replaceable> <option><replaceable>sig</replaceable> <replaceable>args</replaceable></option>
+ <command>&dhpackage;</command>
+ <arg><replaceable>dest</replaceable></arg>
+ <arg><replaceable>path</replaceable></arg>
+ <arg><replaceable>interface</replaceable></arg>
+ <arg><replaceable>method</replaceable></arg>
+ <arg><option><replaceable>sig</replaceable></option></arg>
+ <arg><option><replaceable>args</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
@@ -83,8 +89,6 @@ manpage.1: manpage.sgml
options is included below.
</para>
- <variablelist>
- </variablelist>
</refsect1>
<refsect1>
<title>AUTHOR</title>
diff --git a/Makefile b/Makefile
index 4b39270..72a23b9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ JAVADOC?=javadoc
JAR?=jar
MAKE?=make
MSGFMT?=msgfmt
+DOCBOOKTOMAN?=docbook-to-man
# Program parameters
CPFLAG?=-classpath
@@ -137,7 +138,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc
$(JAVADOC) -quiet -author -link http://java.sun.com/j2se/1.5.0/docs/api/ -classpath $(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar -d doc/api $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/exceptions/*.java
%.1: %.sgml
- docbook-to-man $< > $@
+ $(DOCBOOKTOMAN) $< > $@
bin/%: %.sh .bin
sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@